From e238df95810a8ef032aff5e20f1fe9c1cac2c50f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 30 Jul 2013 15:31:42 -0700 Subject: [PATCH] Comply with naming convention of message processors. --- .../rdp/guac_rdpdr/rdpdr_fs_messages.c | 27 ++++++++++--------- .../rdp/guac_rdpdr/rdpdr_fs_messages.h | 8 +++--- .../guac_rdpdr/rdpdr_fs_messages_file_info.c | 6 ++--- .../guac_rdpdr/rdpdr_fs_messages_file_info.h | 8 +++--- .../guac_rdpdr/rdpdr_fs_messages_vol_info.c | 10 +++---- .../guac_rdpdr/rdpdr_fs_messages_vol_info.h | 10 +++---- .../rdp/guac_rdpdr/rdpdr_fs_service.c | 8 +++--- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c index 1dee3a93..c7b17245 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c @@ -159,7 +159,7 @@ void guac_rdpdr_fs_process_close(guac_rdpdr_device* device, } -void guac_rdpdr_fs_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_volume_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { int fs_information_class, length; @@ -177,23 +177,23 @@ void guac_rdpdr_fs_volume_info(guac_rdpdr_device* device, wStream* input_stream, switch (fs_information_class) { case FileFsVolumeInformation: - guac_rdpdr_fs_query_volume_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_query_volume_info(device, input_stream, completion_id); break; case FileFsSizeInformation: - guac_rdpdr_fs_query_size_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_query_size_info(device, input_stream, completion_id); break; case FileFsDeviceInformation: - guac_rdpdr_fs_query_device_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_query_device_info(device, input_stream, completion_id); break; case FileFsAttributeInformation: - guac_rdpdr_fs_query_attribute_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_query_attribute_info(device, input_stream, completion_id); break; case FileFsFullSizeInformation: - guac_rdpdr_fs_query_full_size_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_query_full_size_info(device, input_stream, completion_id); break; default: @@ -203,7 +203,7 @@ void guac_rdpdr_fs_volume_info(guac_rdpdr_device* device, wStream* input_stream, } -void guac_rdpdr_fs_file_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_file_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { int fs_information_class, length; @@ -221,15 +221,18 @@ void guac_rdpdr_fs_file_info(guac_rdpdr_device* device, wStream* input_stream, switch (fs_information_class) { case FileBasicInformation: - guac_rdpdr_fs_query_basic_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_query_basic_info(device, input_stream, + file_id, completion_id); break; case FileStandardInformation: - guac_rdpdr_fs_query_standard_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_query_standard_info(device, input_stream, + file_id, completion_id); break; case FileAttributeTagInformation: - guac_rdpdr_fs_query_attribute_tag_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_query_attribute_tag_info(device, input_stream, + file_id, completion_id); break; default: @@ -239,13 +242,13 @@ void guac_rdpdr_fs_file_info(guac_rdpdr_device* device, wStream* input_stream, } -void guac_rdpdr_fs_set_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_set_volume_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { /* STUB */ guac_client_log_info(device->rdpdr->client, "STUB: %s", __func__); } -void guac_rdpdr_fs_set_file_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_set_file_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { /* STUB */ guac_client_log_info(device->rdpdr->client, "STUB: %s", __func__); diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h index f5f315e7..8fa79ed8 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.h @@ -64,16 +64,16 @@ void guac_rdpdr_fs_process_write(guac_rdpdr_device* device, void guac_rdpdr_fs_process_close(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); -void guac_rdpdr_fs_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_volume_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); -void guac_rdpdr_fs_set_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_set_volume_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); -void guac_rdpdr_fs_file_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_file_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); -void guac_rdpdr_fs_set_file_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_set_file_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); void guac_rdpdr_fs_process_device_control(guac_rdpdr_device* device, wStream* input_stream, diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c index 3fcdd93b..eb7db5a0 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c @@ -52,7 +52,7 @@ #include -void guac_rdpdr_fs_query_basic_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { wStream* output_stream = Stream_New(NULL, 60); @@ -79,14 +79,14 @@ void guac_rdpdr_fs_query_basic_info(guac_rdpdr_device* device, wStream* input_st } -void guac_rdpdr_fs_query_standard_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_standard_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, "Unimplemented stub: guac_rdpdr_fs_query_standard_info"); } -void guac_rdpdr_fs_query_attribute_tag_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_attribute_tag_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h index 3665f119..b03beed0 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.h @@ -51,12 +51,12 @@ #include -void guac_rdpdr_fs_query_basic_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); -void guac_rdpdr_fs_query_standard_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_standard_info(guac_rdpdr_device* device, wStream* input_stream, int file_id, int completion_id); -void guac_rdpdr_fs_query_attribute_tag_info(guac_rdpdr_device* device, wStream* input_stream, - int file_id, int completion_id); +void guac_rdpdr_fs_process_query_attribute_tag_info(guac_rdpdr_device* device, + wStream* input_stream, int file_id, int completion_id); diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c index 6d57afc7..6ad54a50 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c @@ -51,7 +51,7 @@ #include -void guac_rdpdr_fs_query_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { wStream* output_stream = Stream_New(NULL, 38 + GUAC_FILESYSTEM_NAME_LENGTH); @@ -77,28 +77,28 @@ void guac_rdpdr_fs_query_volume_info(guac_rdpdr_device* device, wStream* input_s } -void guac_rdpdr_fs_query_size_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_size_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, "Unimplemented stub: guac_rdpdr_fs_query_size_info"); } -void guac_rdpdr_fs_query_device_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_device_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, "Unimplemented stub: guac_rdpdr_fs_query_devive_info"); } -void guac_rdpdr_fs_query_attribute_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_attribute_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, "Unimplemented stub: guac_rdpdr_fs_query_attribute_info"); } -void guac_rdpdr_fs_query_full_size_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_full_size_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id) { /* STUB */ guac_client_log_error(device->rdpdr->client, diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h index 5a662437..bf9eab74 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h @@ -51,18 +51,18 @@ #include -void guac_rdpdr_fs_query_volume_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); -void guac_rdpdr_fs_query_size_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_size_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); -void guac_rdpdr_fs_query_device_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_device_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); -void guac_rdpdr_fs_query_attribute_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_attribute_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); -void guac_rdpdr_fs_query_full_size_info(guac_rdpdr_device* device, wStream* input_stream, +void guac_rdpdr_fs_process_query_full_size_info(guac_rdpdr_device* device, wStream* input_stream, int completion_id); diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c index 2eeaa79c..cfa433a7 100644 --- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c +++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c @@ -99,22 +99,22 @@ static void guac_rdpdr_device_fs_iorequest_handler(guac_rdpdr_device* device, /* Query volume (drive) information */ case IRP_MJ_QUERY_VOLUME_INFORMATION: - guac_rdpdr_fs_volume_info(device, input_stream, completion_id); + guac_rdpdr_fs_process_volume_info(device, input_stream, completion_id); break; /* Set volume (drive) information */ case IRP_MJ_SET_VOLUME_INFORMATION: - guac_rdpdr_fs_set_volume_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_set_volume_info(device, input_stream, file_id, completion_id); break; /* Query file information */ case IRP_MJ_QUERY_INFORMATION: - guac_rdpdr_fs_file_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_file_info(device, input_stream, file_id, completion_id); break; /* Set file information */ case IRP_MJ_SET_INFORMATION: - guac_rdpdr_fs_set_file_info(device, input_stream, file_id, completion_id); + guac_rdpdr_fs_process_set_file_info(device, input_stream, file_id, completion_id); break; case IRP_MJ_DIRECTORY_CONTROL: