maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-377: Rename single-letter "e" event arguments variable to "args" for readability.

Browse Source
This commit is contained in:
Michael Jumper 2022-06-09 09:01:51 -07:00
parent ce27936ed5
commit 31f1b2c7c4
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/protocols/rdp/channels/cliprdr.c
View File

@ -509,12 +509,12 @@ static UINT guac_rdp_cliprdr_format_data_response(CliprdrClientContext* cliprdr,
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_cliprdr_channel_connected(rdpContext* context, static void guac_rdp_cliprdr_channel_connected(rdpContext* context,
ChannelConnectedEventArgs* e) { ChannelConnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; 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); assert(clipboard != NULL);
/* Ignore connection event if it's not for the CLIPRDR channel */ /* 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; return;
/* The structure pointed to by pInterface is guaranteed to be a /* The structure pointed to by pInterface is guaranteed to be a
* CliprdrClientContext if the channel is CLIPRDR */ * 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 /* Associate FreeRDP CLIPRDR context and its Guacamole counterpart with
* eachother */ * eachother */
@ -562,12 +562,12 @@ static void guac_rdp_cliprdr_channel_connected(rdpContext* context,
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_cliprdr_channel_disconnected(rdpContext* context, static void guac_rdp_cliprdr_channel_disconnected(rdpContext* context,
ChannelDisconnectedEventArgs* e) { ChannelDisconnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; 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); assert(clipboard != NULL);
/* Ignore disconnection event if it's not for the CLIPRDR channel */ /* 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; return;
/* Channel is no longer connected */ /* Channel is no longer connected */

14
src/protocols/rdp/channels/disp.c
View File

@ -68,19 +68,19 @@ void guac_rdp_disp_free(guac_rdp_disp* disp) {
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_disp_channel_connected(rdpContext* context, static void guac_rdp_disp_channel_connected(rdpContext* context,
ChannelConnectedEventArgs* e) { ChannelConnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_disp* guac_disp = rdp_client->disp; guac_rdp_disp* guac_disp = rdp_client->disp;
/* Ignore connection event if it's not for the Display Update channel */ /* 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; return;
/* Init module with current display size */ /* 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)); guac_rdp_get_height(context->instance));
/* Store reference to the display update plugin once it's connected */ /* 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_disp->disp = disp;
guac_client_log(client, GUAC_LOG_DEBUG, "Display update channel " 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 * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_disp_channel_disconnected(rdpContext* context, static void guac_rdp_disp_channel_disconnected(rdpContext* context,
ChannelDisconnectedEventArgs* e) { ChannelDisconnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_disp* guac_disp = rdp_client->disp; guac_rdp_disp* guac_disp = rdp_client->disp;
/* Ignore disconnection event if it's not for the Display Update channel */ /* 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; return;
/* Channel is no longer connected */ /* Channel is no longer connected */

8
src/protocols/rdp/channels/rail.c
View File

@ -230,22 +230,22 @@ static UINT guac_rdp_rail_handshake_ex(RailClientContext* rail,
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_rail_channel_connected(rdpContext* context, static void guac_rdp_rail_channel_connected(rdpContext* context,
ChannelConnectedEventArgs* e) { ChannelConnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
/* Ignore connection event if it's not for the RAIL channel */ /* 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; return;
/* The structure pointed to by pInterface is guaranteed to be a /* The structure pointed to by pInterface is guaranteed to be a
* RailClientContext if the channel is RAIL */ * 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 /* Init FreeRDP RAIL context, ensuring the guac_client can be accessed from
* within any RAIL-specific callbacks */ * within any RAIL-specific callbacks */

14
src/protocols/rdp/channels/rdpei.c
View File

@ -66,23 +66,23 @@ void guac_rdp_rdpei_free(guac_rdp_rdpei* rdpei) {
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_rdpei_channel_connected(rdpContext* context, static void guac_rdp_rdpei_channel_connected(rdpContext* context,
ChannelConnectedEventArgs* e) { ChannelConnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei; guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei;
/* Ignore connection event if it's not for the RDPEI channel */ /* 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; return;
/* Store reference to the RDPEI plugin once it's connected */ /* Store reference to the RDPEI plugin once it's connected */
RdpeiClientContext* rdpei = (RdpeiClientContext*) e->pInterface; RdpeiClientContext* rdpei = (RdpeiClientContext*) args->pInterface;
guac_rdpei->rdpei = rdpei; guac_rdpei->rdpei = rdpei;
/* Declare level of multi-touch support */ /* Declare level of multi-touch support */
@ -107,19 +107,19 @@ static void guac_rdp_rdpei_channel_connected(rdpContext* context,
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_rdpei_channel_disconnected(rdpContext* context, static void guac_rdp_rdpei_channel_disconnected(rdpContext* context,
ChannelDisconnectedEventArgs* e) { ChannelDisconnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei; guac_rdp_rdpei* guac_rdpei = rdp_client->rdpei;
/* Ignore disconnection event if it's not for the RDPEI channel */ /* 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; return;
/* Channel is no longer connected */ /* Channel is no longer connected */

16
src/protocols/rdp/channels/rdpgfx.c
View File

@ -45,21 +45,21 @@
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_rdpgfx_channel_connected(rdpContext* context, static void guac_rdp_rdpgfx_channel_connected(rdpContext* context,
ChannelConnectedEventArgs* e) { ChannelConnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
/* Ignore connection event if it's not for the RDPGFX channel */ /* 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; return;
/* Init GDI-backed support for the Graphics Pipeline */ /* Init GDI-backed support for the Graphics Pipeline */
RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) e->pInterface; RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) args->pInterface;
rdpGdi* gdi = context->gdi; rdpGdi* gdi = context->gdi;
if (!gdi_graphics_pipeline_init(gdi, rdpgfx)) if (!gdi_graphics_pipeline_init(gdi, rdpgfx))
@ -83,21 +83,21 @@ static void guac_rdp_rdpgfx_channel_connected(rdpContext* context,
* @param context * @param context
* The rdpContext associated with the active RDP session. * The rdpContext associated with the active RDP session.
* *
* @param e * @param args
* Event-specific arguments, mainly the name of the channel, and a * Event-specific arguments, mainly the name of the channel, and a
* reference to the associated plugin loaded for that channel by FreeRDP. * reference to the associated plugin loaded for that channel by FreeRDP.
*/ */
static void guac_rdp_rdpgfx_channel_disconnected(rdpContext* context, static void guac_rdp_rdpgfx_channel_disconnected(rdpContext* context,
ChannelDisconnectedEventArgs* e) { ChannelDisconnectedEventArgs* args) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
/* Ignore disconnection event if it's not for the RDPGFX channel */ /* 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; return;
/* Un-init GDI-backed support for the Graphics Pipeline */ /* Un-init GDI-backed support for the Graphics Pipeline */
RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) e->pInterface; RdpgfxClientContext* rdpgfx = (RdpgfxClientContext*) args->pInterface;
rdpGdi* gdi = context->gdi; rdpGdi* gdi = context->gdi;
gdi_graphics_pipeline_uninit(gdi, rdpgfx); gdi_graphics_pipeline_uninit(gdi, rdpgfx);