From 9128e441c685bdcdeeb170ee5e367ef4cc00f6ea Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 23 Jan 2020 10:50:37 +0100 Subject: [PATCH] Fixed rdpei unused function warning. --- channels/rdpei/client/rdpei_main.c | 33 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c index 64a619ab1..2e72bd449 100644 --- a/channels/rdpei/client/rdpei_main.c +++ b/channels/rdpei/client/rdpei_main.c @@ -112,13 +112,28 @@ typedef struct _RDPEI_PLUGIN RDPEI_PLUGIN; */ static UINT rdpei_send_frame(RdpeiClientContext* context); -static const char* RDPEI_EVENTID_STRINGS[] = { "", - "EVENTID_SC_READY", - "EVENTID_CS_READY", - "EVENTID_TOUCH", - "EVENTID_SUSPEND_TOUCH", - "EVENTID_RESUME_TOUCH", - "EVENTID_DISMISS_HOVERING_CONTACT" }; +#ifdef WITH_DEBUG_RDPEI +static const char* rdpei_eventid_string(UINT16 event) +{ + switch (event) + { + case EVENTID_SC_READY: + return "EVENTID_SC_READY"; + case EVENTID_CS_READY: + return "EVENTID_CS_READY"; + case EVENTID_TOUCH: + return "EVENTID_TOUCH"; + case EVENTID_SUSPEND_TOUCH: + return "EVENTID_SUSPEND_TOUCH"; + case EVENTID_RESUME_TOUCH: + return "EVENTID_RESUME_TOUCH"; + case EVENTID_DISMISS_HOVERING_CONTACT: + return "EVENTID_DISMISS_HOVERING_CONTACT"; + default: + return "EVENTID_UNKNOWN"; + } +} +#endif /** * Function description @@ -179,7 +194,7 @@ static UINT rdpei_send_pdu(RDPEI_CHANNEL_CALLBACK* callback, wStream* s, UINT16 #ifdef WITH_DEBUG_RDPEI WLog_DBG(TAG, "rdpei_send_pdu: eventId: %" PRIu16 " (%s) length: %" PRIu32 " status: %" PRIu32 "", - eventId, RDPEI_EVENTID_STRINGS[eventId], pduLength, status); + eventId, rdpei_eventid_string(eventId), pduLength, status); #endif return status; } @@ -434,7 +449,7 @@ static UINT rdpei_recv_pdu(RDPEI_CHANNEL_CALLBACK* callback, wStream* s) Stream_Read_UINT32(s, pduLength); /* pduLength (4 bytes) */ #ifdef WITH_DEBUG_RDPEI WLog_DBG(TAG, "rdpei_recv_pdu: eventId: %" PRIu16 " (%s) length: %" PRIu32 "", eventId, - RDPEI_EVENTID_STRINGS[eventId], pduLength); + rdpei_eventid_string(eventId), pduLength); #endif switch (eventId)