From 31f1b2c7c488c7ace756d7adecc2933311bbd5b3 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 9 Jun 2022 09:01:51 -0700 Subject: [PATCH] GUACAMOLE-377: Rename single-letter "e" event arguments variable to "args" for readability. --- src/protocols/rdp/channels/cliprdr.c | 14 +++++++------- src/protocols/rdp/channels/disp.c | 14 +++++++------- src/protocols/rdp/channels/rail.c | 8 ++++---- src/protocols/rdp/channels/rdpei.c | 14 +++++++------- src/protocols/rdp/channels/rdpgfx.c | 16 ++++++++-------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/protocols/rdp/channels/cliprdr.c b/src/protocols/rdp/channels/cliprdr.c index 4845577e..f16b41ca 100644 --- a/src/protocols/rdp/channels/cliprdr.c +++ b/src/protocols/rdp/channels/cliprdr.c @@ -509,12 +509,12 @@ static UINT guac_rdp_cliprdr_format_data_response(CliprdrClientContext* cliprdr, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_cliprdr_channel_connected(rdpContext* context, - ChannelConnectedEventArgs* e) { + ChannelConnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; @@ -526,12 +526,12 @@ static void guac_rdp_cliprdr_channel_connected(rdpContext* context, assert(clipboard != NULL); /* Ignore connection event if it's not for the CLIPRDR channel */ - if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, CLIPRDR_SVC_CHANNEL_NAME) != 0) return; /* The structure pointed to by pInterface is guaranteed to be a * CliprdrClientContext if the channel is CLIPRDR */ - CliprdrClientContext* cliprdr = (CliprdrClientContext*) e->pInterface; + CliprdrClientContext* cliprdr = (CliprdrClientContext*) args->pInterface; /* Associate FreeRDP CLIPRDR context and its Guacamole counterpart with * eachother */ @@ -562,12 +562,12 @@ static void guac_rdp_cliprdr_channel_connected(rdpContext* context, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_cliprdr_channel_disconnected(rdpContext* context, - ChannelDisconnectedEventArgs* e) { + ChannelDisconnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; @@ -579,7 +579,7 @@ static void guac_rdp_cliprdr_channel_disconnected(rdpContext* context, assert(clipboard != NULL); /* Ignore disconnection event if it's not for the CLIPRDR channel */ - if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, CLIPRDR_SVC_CHANNEL_NAME) != 0) return; /* Channel is no longer connected */ diff --git a/src/protocols/rdp/channels/disp.c b/src/protocols/rdp/channels/disp.c index 70342ebd..918676b9 100644 --- a/src/protocols/rdp/channels/disp.c +++ b/src/protocols/rdp/channels/disp.c @@ -68,19 +68,19 @@ void guac_rdp_disp_free(guac_rdp_disp* disp) { * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_disp_channel_connected(rdpContext* context, - ChannelConnectedEventArgs* e) { + ChannelConnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_disp* guac_disp = rdp_client->disp; /* Ignore connection event if it's not for the Display Update channel */ - if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, DISP_DVC_CHANNEL_NAME) != 0) return; /* Init module with current display size */ @@ -89,7 +89,7 @@ static void guac_rdp_disp_channel_connected(rdpContext* context, guac_rdp_get_height(context->instance)); /* Store reference to the display update plugin once it's connected */ - DispClientContext* disp = (DispClientContext*) e->pInterface; + DispClientContext* disp = (DispClientContext*) args->pInterface; guac_disp->disp = disp; guac_client_log(client, GUAC_LOG_DEBUG, "Display update channel " @@ -110,19 +110,19 @@ static void guac_rdp_disp_channel_connected(rdpContext* context, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_disp_channel_disconnected(rdpContext* context, - ChannelDisconnectedEventArgs* e) { + ChannelDisconnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_disp* guac_disp = rdp_client->disp; /* Ignore disconnection event if it's not for the Display Update channel */ - if (strcmp(e->name, DISP_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, DISP_DVC_CHANNEL_NAME) != 0) return; /* Channel is no longer connected */ diff --git a/src/protocols/rdp/channels/rail.c b/src/protocols/rdp/channels/rail.c index 6f8d7f7f..e8ac1698 100644 --- a/src/protocols/rdp/channels/rail.c +++ b/src/protocols/rdp/channels/rail.c @@ -230,22 +230,22 @@ static UINT guac_rdp_rail_handshake_ex(RailClientContext* rail, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_rail_channel_connected(rdpContext* context, - ChannelConnectedEventArgs* e) { + ChannelConnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; /* Ignore connection event if it's not for the RAIL channel */ - if (strcmp(e->name, RAIL_SVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, RAIL_SVC_CHANNEL_NAME) != 0) return; /* The structure pointed to by pInterface is guaranteed to be a * RailClientContext if the channel is RAIL */ - RailClientContext* rail = (RailClientContext*) e->pInterface; + RailClientContext* rail = (RailClientContext*) args->pInterface; /* Init FreeRDP RAIL context, ensuring the guac_client can be accessed from * within any RAIL-specific callbacks */ diff --git a/src/protocols/rdp/channels/rdpei.c b/src/protocols/rdp/channels/rdpei.c index 06d2ba4c..a7e6f349 100644 --- a/src/protocols/rdp/channels/rdpei.c +++ b/src/protocols/rdp/channels/rdpei.c @@ -66,23 +66,23 @@ void guac_rdp_rdpei_free(guac_rdp_rdpei* rdpei) { * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_rdpei_channel_connected(rdpContext* context, - ChannelConnectedEventArgs* e) { + ChannelConnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei; /* Ignore connection event if it's not for the RDPEI channel */ - if (strcmp(e->name, RDPEI_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, RDPEI_DVC_CHANNEL_NAME) != 0) return; /* Store reference to the RDPEI plugin once it's connected */ - RdpeiClientContext* rdpei = (RdpeiClientContext*) e->pInterface; + RdpeiClientContext* rdpei = (RdpeiClientContext*) args->pInterface; guac_rdpei->rdpei = rdpei; /* Declare level of multi-touch support */ @@ -107,19 +107,19 @@ static void guac_rdp_rdpei_channel_connected(rdpContext* context, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_rdpei_channel_disconnected(rdpContext* context, - ChannelDisconnectedEventArgs* e) { + ChannelDisconnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei; /* Ignore disconnection event if it's not for the RDPEI channel */ - if (strcmp(e->name, RDPEI_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, RDPEI_DVC_CHANNEL_NAME) != 0) return; /* Channel is no longer connected */ diff --git a/src/protocols/rdp/channels/rdpgfx.c b/src/protocols/rdp/channels/rdpgfx.c index f22ffbf3..0fae972f 100644 --- a/src/protocols/rdp/channels/rdpgfx.c +++ b/src/protocols/rdp/channels/rdpgfx.c @@ -45,21 +45,21 @@ * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_rdpgfx_channel_connected(rdpContext* context, - ChannelConnectedEventArgs* e) { + ChannelConnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; /* Ignore connection event if it's not for the RDPGFX channel */ - if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, RDPGFX_DVC_CHANNEL_NAME) != 0) return; /* Init GDI-backed support for the Graphics Pipeline */ - RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) e->pInterface; + RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) args->pInterface; rdpGdi* gdi = context->gdi; if (!gdi_graphics_pipeline_init(gdi, rdpgfx)) @@ -83,21 +83,21 @@ static void guac_rdp_rdpgfx_channel_connected(rdpContext* context, * @param context * The rdpContext associated with the active RDP session. * - * @param e + * @param args * Event-specific arguments, mainly the name of the channel, and a * reference to the associated plugin loaded for that channel by FreeRDP. */ static void guac_rdp_rdpgfx_channel_disconnected(rdpContext* context, - ChannelDisconnectedEventArgs* e) { + ChannelDisconnectedEventArgs* args) { guac_client* client = ((rdp_freerdp_context*) context)->client; /* Ignore disconnection event if it's not for the RDPGFX channel */ - if (strcmp(e->name, RDPGFX_DVC_CHANNEL_NAME) != 0) + if (strcmp(args->name, RDPGFX_DVC_CHANNEL_NAME) != 0) return; /* Un-init GDI-backed support for the Graphics Pipeline */ - RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) e->pInterface; + RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) args->pInterface; rdpGdi* gdi = context->gdi; gdi_graphics_pipeline_uninit(gdi, rdpgfx);