From d7bbee35b01e85241979549a8f8bddf8bcbe37b0 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 23 Dec 2019 13:29:13 -0800 Subject: [PATCH] GUACAMOLE-249: Reorganize includes to match code standard. --- src/protocols/rdp/bitmap.c | 3 +-- src/protocols/rdp/bitmap.h | 5 ++-- src/protocols/rdp/channels/audio-input.h | 4 ++-- src/protocols/rdp/channels/cliprdr.c | 4 ++-- src/protocols/rdp/channels/cliprdr.h | 4 ++-- src/protocols/rdp/channels/common-svc.c | 2 +- src/protocols/rdp/channels/common-svc.h | 4 ++-- src/protocols/rdp/channels/disp.c | 4 ++-- src/protocols/rdp/channels/disp.h | 4 ++-- src/protocols/rdp/channels/pipe-svc.c | 7 +++--- src/protocols/rdp/channels/pipe-svc.h | 4 ++-- src/protocols/rdp/channels/rail.c | 5 ++-- src/protocols/rdp/channels/rail.h | 6 +++-- .../rdpdr/rdpdr-fs-messages-dir-info.h | 5 ++-- .../rdpdr/rdpdr-fs-messages-file-info.h | 5 ++-- .../rdpdr/rdpdr-fs-messages-vol-info.c | 2 +- .../rdpdr/rdpdr-fs-messages-vol-info.h | 5 ++-- .../rdp/channels/rdpdr/rdpdr-fs-messages.c | 4 ++-- .../rdp/channels/rdpdr/rdpdr-fs-messages.h | 5 ++-- src/protocols/rdp/channels/rdpdr/rdpdr-fs.c | 5 ++-- src/protocols/rdp/channels/rdpdr/rdpdr-fs.h | 5 ++-- .../rdp/channels/rdpdr/rdpdr-messages.c | 4 ++-- .../rdp/channels/rdpdr/rdpdr-messages.h | 5 ++-- .../rdp/channels/rdpdr/rdpdr-printer.c | 4 ++-- .../rdp/channels/rdpdr/rdpdr-printer.h | 5 ++-- src/protocols/rdp/channels/rdpdr/rdpdr.c | 12 +++++----- src/protocols/rdp/channels/rdpdr/rdpdr.h | 4 ++-- .../rdp/channels/rdpsnd/rdpsnd-messages.c | 10 ++++---- .../rdp/channels/rdpsnd/rdpsnd-messages.h | 5 ++-- src/protocols/rdp/channels/rdpsnd/rdpsnd.c | 4 ++-- src/protocols/rdp/channels/rdpsnd/rdpsnd.h | 4 ++-- src/protocols/rdp/client.c | 7 +++--- src/protocols/rdp/error.c | 1 - src/protocols/rdp/fs.c | 14 +++++------ src/protocols/rdp/fs.h | 5 ++-- src/protocols/rdp/gdi.c | 5 ++-- src/protocols/rdp/gdi.h | 5 ++-- src/protocols/rdp/glyph.c | 5 ++-- src/protocols/rdp/glyph.h | 5 ++-- src/protocols/rdp/input.c | 3 +-- src/protocols/rdp/keyboard/decompose.h | 4 ++-- src/protocols/rdp/keyboard/keyboard.c | 3 +-- src/protocols/rdp/keyboard/keymap.h | 5 ++-- src/protocols/rdp/plugins/channels.h | 4 ++-- .../plugins/guac-common-svc/guac-common-svc.c | 6 ++--- .../rdp/plugins/guacai/guacai-messages.c | 9 ++++---- .../rdp/plugins/guacai/guacai-messages.h | 4 ++-- src/protocols/rdp/plugins/guacai/guacai.c | 11 ++++----- src/protocols/rdp/plugins/guacai/guacai.h | 6 ++--- src/protocols/rdp/plugins/ptr-string.h | 4 ++-- src/protocols/rdp/pointer.c | 3 +-- src/protocols/rdp/pointer.h | 5 ++-- src/protocols/rdp/print-job.c | 1 - src/protocols/rdp/rdp.c | 23 +++++++++---------- src/protocols/rdp/rdp.h | 5 ++-- src/protocols/rdp/settings.c | 3 +-- src/protocols/rdp/settings.h | 6 ++--- src/protocols/rdp/status.h | 5 ++-- src/protocols/rdp/stream.c | 5 ++-- src/protocols/rdp/stream.h | 5 ++-- src/protocols/rdp/unicode.c | 4 ++-- src/protocols/rdp/user.c | 5 ++-- 62 files changed, 146 insertions(+), 179 deletions(-) diff --git a/src/protocols/rdp/bitmap.c b/src/protocols/rdp/bitmap.c index 093dae15..56d80e35 100644 --- a/src/protocols/rdp/bitmap.c +++ b/src/protocols/rdp/bitmap.c @@ -18,12 +18,11 @@ */ #include "config.h" - +#include "bitmap.h" #include "client.h" #include "common/display.h" #include "common/surface.h" #include "rdp.h" -#include "bitmap.h" #include "settings.h" #include diff --git a/src/protocols/rdp/bitmap.h b/src/protocols/rdp/bitmap.h index 23c56404..07d3688d 100644 --- a/src/protocols/rdp/bitmap.h +++ b/src/protocols/rdp/bitmap.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_RDP_BITMAP_H -#define _GUAC_RDP_RDP_BITMAP_H +#ifndef GUAC_RDP_BITMAP_H +#define GUAC_RDP_BITMAP_H #include "config.h" #include "common/display.h" diff --git a/src/protocols/rdp/channels/audio-input.h b/src/protocols/rdp/channels/audio-input.h index 3f987619..19b6f66c 100644 --- a/src/protocols/rdp/channels/audio-input.h +++ b/src/protocols/rdp/channels/audio-input.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_AUDIO_INPUT_H -#define GUAC_RDP_AUDIO_INPUT_H +#ifndef GUAC_RDP_CHANNELS_AUDIO_INPUT_H +#define GUAC_RDP_CHANNELS_AUDIO_INPUT_H #include "config.h" diff --git a/src/protocols/rdp/channels/cliprdr.c b/src/protocols/rdp/channels/cliprdr.c index 8cc43fec..fc0e31eb 100644 --- a/src/protocols/rdp/channels/cliprdr.c +++ b/src/protocols/rdp/channels/cliprdr.c @@ -19,11 +19,11 @@ #include "config.h" -#include "plugins/channels.h" -#include "client.h" #include "channels/cliprdr.h" +#include "client.h" #include "common/clipboard.h" #include "common/iconv.h" +#include "plugins/channels.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/channels/cliprdr.h b/src/protocols/rdp/channels/cliprdr.h index 2562f12e..42cfddec 100644 --- a/src/protocols/rdp/channels/cliprdr.h +++ b/src/protocols/rdp/channels/cliprdr.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_CLIPBOARD_H -#define GUAC_RDP_CLIPBOARD_H +#ifndef GUAC_RDP_CHANNELS_CLIPRDR_H +#define GUAC_RDP_CHANNELS_CLIPRDR_H #include "config.h" #include "common/clipboard.h" diff --git a/src/protocols/rdp/channels/common-svc.c b/src/protocols/rdp/channels/common-svc.c index 0ba83220..a089bac5 100644 --- a/src/protocols/rdp/channels/common-svc.c +++ b/src/protocols/rdp/channels/common-svc.c @@ -18,8 +18,8 @@ */ #include "config.h" -#include "plugins/channels.h" #include "channels/common-svc.h" +#include "plugins/channels.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/channels/common-svc.h b/src/protocols/rdp/channels/common-svc.h index 5370d5f6..3be2c006 100644 --- a/src/protocols/rdp/channels/common-svc.h +++ b/src/protocols/rdp/channels/common-svc.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_SVC_H -#define GUAC_RDP_SVC_H +#ifndef GUAC_RDP_CHANNELS_COMMON_SVC_H +#define GUAC_RDP_CHANNELS_COMMON_SVC_H #include "config.h" diff --git a/src/protocols/rdp/channels/disp.c b/src/protocols/rdp/channels/disp.c index 73920f46..d487a043 100644 --- a/src/protocols/rdp/channels/disp.c +++ b/src/protocols/rdp/channels/disp.c @@ -18,9 +18,9 @@ */ #include "config.h" -#include "plugins/channels.h" -#include "client.h" #include "channels/disp.h" +#include "client.h" +#include "plugins/channels.h" #include "rdp.h" #include "settings.h" diff --git a/src/protocols/rdp/channels/disp.h b/src/protocols/rdp/channels/disp.h index e88e8e48..650f7ad8 100644 --- a/src/protocols/rdp/channels/disp.h +++ b/src/protocols/rdp/channels/disp.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_DISP_H -#define GUAC_RDP_DISP_H +#ifndef GUAC_RDP_CHANNELS_DISP_H +#define GUAC_RDP_CHANNELS_DISP_H #include "settings.h" diff --git a/src/protocols/rdp/channels/pipe-svc.c b/src/protocols/rdp/channels/pipe-svc.c index 68017ab1..3bf90ed9 100644 --- a/src/protocols/rdp/channels/pipe-svc.c +++ b/src/protocols/rdp/channels/pipe-svc.c @@ -18,12 +18,11 @@ */ #include "config.h" - -#include "plugins/channels.h" -#include "client.h" -#include "common/list.h" #include "channels/common-svc.h" #include "channels/pipe-svc.h" +#include "client.h" +#include "common/list.h" +#include "plugins/channels.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/channels/pipe-svc.h b/src/protocols/rdp/channels/pipe-svc.h index 0744740f..f75cebbf 100644 --- a/src/protocols/rdp/channels/pipe-svc.h +++ b/src/protocols/rdp/channels/pipe-svc.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_PIPE_SVC_H -#define GUAC_RDP_PIPE_SVC_H +#ifndef GUAC_RDP_CHANNELS_PIPE_SVC_H +#define GUAC_RDP_CHANNELS_PIPE_SVC_H #include "config.h" #include "channels/common-svc.h" diff --git a/src/protocols/rdp/channels/rail.c b/src/protocols/rdp/channels/rail.c index 65bc9717..a96c0ad9 100644 --- a/src/protocols/rdp/channels/rail.c +++ b/src/protocols/rdp/channels/rail.c @@ -18,10 +18,9 @@ */ #include "config.h" - -#include "plugins/channels.h" -#include "client.h" #include "channels/rail.h" +#include "client.h" +#include "plugins/channels.h" #include "rdp.h" #include "settings.h" diff --git a/src/protocols/rdp/channels/rail.h b/src/protocols/rdp/channels/rail.h index 718c62b3..cb5e0891 100644 --- a/src/protocols/rdp/channels/rail.h +++ b/src/protocols/rdp/channels/rail.h @@ -17,11 +17,13 @@ * under the License. */ -#ifndef GUAC_RDP_RAIL_H -#define GUAC_RDP_RAIL_H +#ifndef GUAC_RDP_CHANNELS_RAIL_H +#define GUAC_RDP_CHANNELS_RAIL_H #include "config.h" +#include + /** * Initializes RemoteApp support for RDP and handling of the RAIL channel. If * failures occur, messages noting the specifics of those failures will be diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.h b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.h index 02acfdd4..6f344171 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H -#define GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_DIR_INFO_H +#define RDP_CHANNELS_GUAC_RDPDR_FS_MESSAGES_DIR_INFO_H /** * Handlers for directory queries received over the RDPDR channel via the diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.h b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.h index f2bb0d8f..5ce84424 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_FS_MESSAGES_FILE_INFO_H -#define GUAC_RDPDR_FS_MESSAGES_FILE_INFO_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_FILE_INFO_H +#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_FILE_INFO_H /** * Handlers for file queries received over the RDPDR channel via the diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c index afacde67..c6f90b94 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c @@ -18,8 +18,8 @@ */ #include "config.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-messages.h" +#include "channels/rdpdr/rdpdr.h" #include "fs.h" #include "status.h" diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.h b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.h index e6a95dd5..46ccdab2 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_FS_MESSAGES_VOL_INFO_H -#define GUAC_RDPDR_FS_MESSAGES_VOL_INFO_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_VOL_INFO_H +#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_VOL_INFO_H /** * Handlers for directory queries received over the RDPDR channel via the diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c index 67bf3495..38727ec9 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c @@ -18,12 +18,12 @@ */ #include "config.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-fs-messages-dir-info.h" #include "channels/rdpdr/rdpdr-fs-messages-file-info.h" -#include "channels/rdpdr/rdpdr-fs-messages.h" #include "channels/rdpdr/rdpdr-fs-messages-vol-info.h" +#include "channels/rdpdr/rdpdr-fs-messages.h" #include "channels/rdpdr/rdpdr-messages.h" +#include "channels/rdpdr/rdpdr.h" #include "fs.h" #include "status.h" #include "unicode.h" diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.h b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.h index 27aba844..74f3ccda 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_FS_MESSAGES_H -#define GUAC_RDPDR_FS_MESSAGES_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_H +#define GUAC_RDP_CHANNELS_RDPDR_FS_MESSAGES_H /** * Handlers for core drive I/O requests. Requests handled here may be simple diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs.c index 89f2ba6f..3ca862cf 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs.c @@ -17,12 +17,11 @@ * under the License. */ - #include "config.h" -#include "rdp.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-fs-messages.h" #include "channels/rdpdr/rdpdr-messages.h" +#include "channels/rdpdr/rdpdr.h" +#include "rdp.h" #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs.h b/src/protocols/rdp/channels/rdpdr/rdpdr-fs.h index 63f4a5d7..295a0225 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_FS_H -#define GUAC_RDPDR_FS_H +#ifndef GUAC_RDP_RDPDR_FS_H +#define GUAC_RDP_RDPDR_FS_H /** * Functions and macros specific to filesystem handling and initialization diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-messages.c b/src/protocols/rdp/channels/rdpdr/rdpdr-messages.c index b063bbfa..b9b67383 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-messages.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-messages.c @@ -18,9 +18,9 @@ */ #include "config.h" -#include "rdp.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-messages.h" +#include "channels/rdpdr/rdpdr.h" +#include "rdp.h" #include "unicode.h" #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-messages.h b/src/protocols/rdp/channels/rdpdr/rdpdr-messages.h index 1f2db3be..d1352d72 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-messages.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-messages.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_MESSAGES_H -#define GUAC_RDPDR_MESSAGES_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_MESSAGES_H +#define GUAC_RDP_CHANNELS_RDPDR_MESSAGES_H #include "config.h" #include "channels/rdpdr/rdpdr.h" diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c index dd16a5c4..8ee8bb7b 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c @@ -18,11 +18,11 @@ */ #include "config.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr-printer.h" -#include "rdp.h" +#include "channels/rdpdr/rdpdr.h" #include "print-job.h" +#include "rdp.h" #include "status.h" #include "unicode.h" diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.h b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.h index 8e967c7a..3e0df55d 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPDR_PRINTER_H -#define GUAC_RDPDR_PRINTER_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_PRINTER_H +#define GUAC_RDP_CHANNELS_RDPDR_PRINTER_H #include "config.h" #include "channels/rdpdr/rdpdr.h" diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr.c b/src/protocols/rdp/channels/rdpdr/rdpdr.c index 6fe4c65e..10b594f6 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr.c @@ -18,15 +18,15 @@ */ #include "config.h" -#include "plugins/channels.h" -#include "rdp.h" -#include "fs.h" -#include "settings.h" -#include "stream.h" -#include "channels/rdpdr/rdpdr.h" #include "channels/rdpdr/rdpdr-fs.h" #include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr-printer.h" +#include "channels/rdpdr/rdpdr.h" +#include "fs.h" +#include "plugins/channels.h" +#include "rdp.h" +#include "settings.h" +#include "stream.h" #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr.h b/src/protocols/rdp/channels/rdpdr/rdpdr.h index 3984d9c4..fa25f3d2 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr.h +++ b/src/protocols/rdp/channels/rdpdr/rdpdr.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_RDPDR_H -#define GUAC_RDP_RDPDR_H +#ifndef GUAC_RDP_CHANNELS_RDPDR_H +#define GUAC_RDP_CHANNELS_RDPDR_H #include "config.h" #include "channels/common-svc.h" diff --git a/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c b/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c index 76856833..f0dedaa0 100644 --- a/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c +++ b/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c @@ -19,12 +19,9 @@ #include "config.h" -#include "rdp.h" -#include "channels/rdpsnd/rdpsnd.h" #include "channels/rdpsnd/rdpsnd-messages.h" - -#include -#include +#include "channels/rdpsnd/rdpsnd.h" +#include "rdp.h" #include #include @@ -32,6 +29,9 @@ #include #include +#include +#include + void guac_rdpsnd_formats_handler(guac_rdp_common_svc* svc, wStream* input_stream, guac_rdpsnd_pdu_header* header) { diff --git a/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.h b/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.h index 737f6222..3c3733c6 100644 --- a/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.h +++ b/src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef GUAC_RDPSND_MESSAGES_H -#define GUAC_RDPSND_MESSAGES_H +#ifndef GUAC_RDP_CHANNELS_RDPSND_MESSAGES_H +#define GUAC_RDP_CHANNELS_RDPSND_MESSAGES_H #include "config.h" #include "channels/common-svc.h" diff --git a/src/protocols/rdp/channels/rdpsnd/rdpsnd.c b/src/protocols/rdp/channels/rdpsnd/rdpsnd.c index 59913445..5859d4e3 100644 --- a/src/protocols/rdp/channels/rdpsnd/rdpsnd.c +++ b/src/protocols/rdp/channels/rdpsnd/rdpsnd.c @@ -19,9 +19,9 @@ #include "config.h" #include "channels/common-svc.h" -#include "rdp.h" -#include "channels/rdpsnd/rdpsnd.h" #include "channels/rdpsnd/rdpsnd-messages.h" +#include "channels/rdpsnd/rdpsnd.h" +#include "rdp.h" #include #include diff --git a/src/protocols/rdp/channels/rdpsnd/rdpsnd.h b/src/protocols/rdp/channels/rdpsnd/rdpsnd.h index 0c2abcee..014d04d8 100644 --- a/src/protocols/rdp/channels/rdpsnd/rdpsnd.h +++ b/src/protocols/rdp/channels/rdpsnd/rdpsnd.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_RDPSND_H -#define GUAC_RDP_RDPSND_H +#ifndef GUAC_RDP_CHANNELS_RDPSND_H +#define GUAC_RDP_CHANNELS_RDPSND_H #include "config.h" #include "channels/common-svc.h" diff --git a/src/protocols/rdp/client.c b/src/protocols/rdp/client.c index d1e294be..123e1339 100644 --- a/src/protocols/rdp/client.c +++ b/src/protocols/rdp/client.c @@ -18,13 +18,12 @@ */ #include "config.h" - #include "channels/audio-input.h" -#include "common/recording.h" -#include "client.h" #include "channels/disp.h" -#include "rdp.h" +#include "client.h" +#include "common/recording.h" #include "fs.h" +#include "rdp.h" #include "user.h" #ifdef ENABLE_COMMON_SSH diff --git a/src/protocols/rdp/error.c b/src/protocols/rdp/error.c index e3403625..0fbc6de9 100644 --- a/src/protocols/rdp/error.c +++ b/src/protocols/rdp/error.c @@ -18,7 +18,6 @@ */ #include "config.h" - #include "error.h" #include "rdp.h" diff --git a/src/protocols/rdp/fs.c b/src/protocols/rdp/fs.c index fc8be597..68689cd2 100644 --- a/src/protocols/rdp/fs.c +++ b/src/protocols/rdp/fs.c @@ -23,6 +23,13 @@ #include "status.h" #include "stream.h" +#include +#include +#include +#include +#include +#include + #include #include #include @@ -35,13 +42,6 @@ #include #include -#include -#include -#include -#include -#include -#include - guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path, int create_drive_path) { diff --git a/src/protocols/rdp/fs.h b/src/protocols/rdp/fs.h index 8586810b..1f140bb8 100644 --- a/src/protocols/rdp/fs.h +++ b/src/protocols/rdp/fs.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef __GUAC_RDP_FS_H -#define __GUAC_RDP_FS_H +#ifndef GUAC_RDP_FS_H +#define GUAC_RDP_FS_H /** * Functions and macros specific to filesystem handling and initialization diff --git a/src/protocols/rdp/gdi.c b/src/protocols/rdp/gdi.c index 5aed6061..1961fdb5 100644 --- a/src/protocols/rdp/gdi.c +++ b/src/protocols/rdp/gdi.c @@ -18,12 +18,11 @@ */ #include "config.h" - +#include "bitmap.h" #include "client.h" +#include "color.h" #include "common/surface.h" #include "rdp.h" -#include "bitmap.h" -#include "color.h" #include "settings.h" #include diff --git a/src/protocols/rdp/gdi.h b/src/protocols/rdp/gdi.h index 29d29478..983a6e6a 100644 --- a/src/protocols/rdp/gdi.h +++ b/src/protocols/rdp/gdi.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_RDP_GDI_H -#define _GUAC_RDP_RDP_GDI_H +#ifndef GUAC_RDP_GDI_H +#define GUAC_RDP_GDI_H #include "config.h" diff --git a/src/protocols/rdp/glyph.c b/src/protocols/rdp/glyph.c index fe21df02..6a0aaab8 100644 --- a/src/protocols/rdp/glyph.c +++ b/src/protocols/rdp/glyph.c @@ -18,12 +18,11 @@ */ #include "config.h" - #include "client.h" -#include "common/surface.h" -#include "rdp.h" #include "color.h" +#include "common/surface.h" #include "glyph.h" +#include "rdp.h" #include "settings.h" #include diff --git a/src/protocols/rdp/glyph.h b/src/protocols/rdp/glyph.h index c14efbbc..fa824e66 100644 --- a/src/protocols/rdp/glyph.h +++ b/src/protocols/rdp/glyph.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_RDP_GLYPH_H -#define _GUAC_RDP_RDP_GLYPH_H +#ifndef GUAC_RDP_GLYPH_H +#define GUAC_RDP_GLYPH_H #include "config.h" diff --git a/src/protocols/rdp/input.c b/src/protocols/rdp/input.c index b1031e3f..44a46998 100644 --- a/src/protocols/rdp/input.c +++ b/src/protocols/rdp/input.c @@ -18,10 +18,9 @@ */ #include "config.h" - +#include "channels/disp.h" #include "client.h" #include "common/recording.h" -#include "channels/disp.h" #include "input.h" #include "keyboard/keyboard.h" #include "rdp.h" diff --git a/src/protocols/rdp/keyboard/decompose.h b/src/protocols/rdp/keyboard/decompose.h index 0d5a0765..0c3765ed 100644 --- a/src/protocols/rdp/keyboard/decompose.h +++ b/src/protocols/rdp/keyboard/decompose.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_DECOMPOSE_H -#define GUAC_RDP_DECOMPOSE_H +#ifndef GUAC_RDP_KEYBOARD_DECOMPOSE_H +#define GUAC_RDP_KEYBOARD_DECOMPOSE_H #include "config.h" #include "keyboard/keyboard.h" diff --git a/src/protocols/rdp/keyboard/keyboard.c b/src/protocols/rdp/keyboard/keyboard.c index 90fc99df..7b1414c8 100644 --- a/src/protocols/rdp/keyboard/keyboard.c +++ b/src/protocols/rdp/keyboard/keyboard.c @@ -18,12 +18,11 @@ */ #include "config.h" - #include "client.h" #include "keyboard/decompose.h" #include "keyboard/keyboard.h" -#include "rdp.h" #include "keyboard/keymap.h" +#include "rdp.h" #include #include diff --git a/src/protocols/rdp/keyboard/keymap.h b/src/protocols/rdp/keyboard/keymap.h index 05ed6db5..d0074e52 100644 --- a/src/protocols/rdp/keyboard/keymap.h +++ b/src/protocols/rdp/keyboard/keymap.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_RDP_KEYMAP_H -#define _GUAC_RDP_RDP_KEYMAP_H +#ifndef GUAC_RDP_KEYBOARD_KEYMAP_H +#define GUAC_RDP_KEYBOARD_KEYMAP_H #include "config.h" diff --git a/src/protocols/rdp/plugins/channels.h b/src/protocols/rdp/plugins/channels.h index d31a685b..f324f876 100644 --- a/src/protocols/rdp/plugins/channels.h +++ b/src/protocols/rdp/plugins/channels.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_CHANNELS_H -#define GUAC_RDP_CHANNELS_H +#ifndef GUAC_RDP_PLUGINS_CHANNELS_H +#define GUAC_RDP_PLUGINS_CHANNELS_H #include "config.h" diff --git a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c index 7318e1e5..c55b606e 100644 --- a/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c +++ b/src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c @@ -20,9 +20,6 @@ #include "config.h" #include "channels/common-svc.h" -#include -#include - #include #include #include @@ -31,6 +28,9 @@ #include #include +#include +#include + /** * Event handler for events which deal with data transmitted over an open SVC. * This specific implementation of the event handler currently handles only the diff --git a/src/protocols/rdp/plugins/guacai/guacai-messages.c b/src/protocols/rdp/plugins/guacai/guacai-messages.c index 341914af..083d7ae3 100644 --- a/src/protocols/rdp/plugins/guacai/guacai-messages.c +++ b/src/protocols/rdp/plugins/guacai/guacai-messages.c @@ -18,19 +18,18 @@ */ #include "config.h" - -#include "plugins/guacai/guacai-messages.h" #include "channels/audio-input.h" +#include "plugins/guacai/guacai-messages.h" #include "rdp.h" -#include - -#include #include #include +#include #include #include +#include + /** * Reads AUDIO_FORMAT data from the given stream into the given struct. * diff --git a/src/protocols/rdp/plugins/guacai/guacai-messages.h b/src/protocols/rdp/plugins/guacai/guacai-messages.h index 1d825af0..a2d35050 100644 --- a/src/protocols/rdp/plugins/guacai/guacai-messages.h +++ b/src/protocols/rdp/plugins/guacai/guacai-messages.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_AI_MESSAGES_H -#define GUAC_RDP_AI_MESSAGES_H +#ifndef GUAC_RDP_PLUGINS_GUACAI_MESSAGES_H +#define GUAC_RDP_PLUGINS_GUACAI_MESSAGES_H #include "config.h" diff --git a/src/protocols/rdp/plugins/guacai/guacai.c b/src/protocols/rdp/plugins/guacai/guacai.c index ba660786..ac1f67b3 100644 --- a/src/protocols/rdp/plugins/guacai/guacai.c +++ b/src/protocols/rdp/plugins/guacai/guacai.c @@ -18,22 +18,21 @@ */ #include "config.h" - +#include "channels/audio-input.h" #include "plugins/guacai/guacai-messages.h" #include "plugins/guacai/guacai.h" -#include "channels/audio-input.h" #include "plugins/ptr-string.h" #include "rdp.h" -#include -#include - -#include #include #include +#include #include #include +#include +#include + /** * Handles the given data received along the AUDIO_INPUT channel of the RDP * connection associated with the given guac_client. This handler is diff --git a/src/protocols/rdp/plugins/guacai/guacai.h b/src/protocols/rdp/plugins/guacai/guacai.h index 28f2227e..dacf531a 100644 --- a/src/protocols/rdp/plugins/guacai/guacai.h +++ b/src/protocols/rdp/plugins/guacai/guacai.h @@ -17,14 +17,14 @@ * under the License. */ -#ifndef GUAC_RDP_AI_SERVICE_H -#define GUAC_RDP_AI_SERVICE_H +#ifndef GUAC_RDP_PLUGINS_GUACAI_H +#define GUAC_RDP_PLUGINS_GUACAI_H #include "config.h" -#include #include #include +#include #include /** diff --git a/src/protocols/rdp/plugins/ptr-string.h b/src/protocols/rdp/plugins/ptr-string.h index 9a9156bf..bcc226c4 100644 --- a/src/protocols/rdp/plugins/ptr-string.h +++ b/src/protocols/rdp/plugins/ptr-string.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_PTR_STRING_H -#define GUAC_RDP_PTR_STRING_H +#ifndef GUAC_RDP_PLUGINS_PTR_STRING_H +#define GUAC_RDP_PLUGINS_PTR_STRING_H #include "config.h" diff --git a/src/protocols/rdp/pointer.c b/src/protocols/rdp/pointer.c index 3883e211..498bc883 100644 --- a/src/protocols/rdp/pointer.c +++ b/src/protocols/rdp/pointer.c @@ -18,12 +18,11 @@ */ #include "config.h" - #include "client.h" #include "common/cursor.h" #include "common/display.h" -#include "rdp.h" #include "pointer.h" +#include "rdp.h" #include #include diff --git a/src/protocols/rdp/pointer.h b/src/protocols/rdp/pointer.h index d3809e92..7f4547b7 100644 --- a/src/protocols/rdp/pointer.h +++ b/src/protocols/rdp/pointer.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_RDP_POINTER_H -#define _GUAC_RDP_RDP_POINTER_H +#ifndef GUAC_RDP_POINTER_H +#define GUAC_RDP_POINTER_H #include "config.h" #include "common/display.h" diff --git a/src/protocols/rdp/print-job.c b/src/protocols/rdp/print-job.c index 8e6211e4..fed49bb3 100644 --- a/src/protocols/rdp/print-job.c +++ b/src/protocols/rdp/print-job.c @@ -17,7 +17,6 @@ * under the License. */ - #include "config.h" #include "print-job.h" diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index 4bfc0c8d..7e91ef11 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -18,29 +18,28 @@ */ #include "config.h" - +#include "bitmap.h" #include "channels/audio-input.h" -#include "plugins/channels.h" -#include "client.h" #include "channels/cliprdr.h" +#include "channels/disp.h" +#include "channels/pipe-svc.h" +#include "channels/rail.h" +#include "channels/rdpdr/rdpdr.h" +#include "channels/rdpsnd/rdpsnd.h" +#include "client.h" #include "common/cursor.h" #include "common/display.h" #include "common/recording.h" -#include "channels/disp.h" #include "error.h" -#include "keyboard/keyboard.h" -#include "channels/pipe-svc.h" -#include "channels/rail.h" -#include "rdp.h" -#include "bitmap.h" #include "fs.h" -#include "print-job.h" #include "gdi.h" #include "glyph.h" +#include "keyboard/keyboard.h" +#include "plugins/channels.h" #include "pointer.h" +#include "print-job.h" +#include "rdp.h" #include "stream.h" -#include "channels/rdpdr/rdpdr.h" -#include "channels/rdpsnd/rdpsnd.h" #ifdef ENABLE_COMMON_SSH #include "common-ssh/sftp.h" diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h index 64a5a507..41f99a2b 100644 --- a/src/protocols/rdp/rdp.h +++ b/src/protocols/rdp/rdp.h @@ -21,17 +21,16 @@ #define GUAC_RDP_H #include "config.h" - #include "channels/audio-input.h" #include "channels/cliprdr.h" +#include "channels/disp.h" #include "common/clipboard.h" #include "common/display.h" #include "common/list.h" #include "common/recording.h" #include "common/surface.h" -#include "channels/disp.h" -#include "keyboard/keyboard.h" #include "fs.h" +#include "keyboard/keyboard.h" #include "print-job.h" #include "settings.h" diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c index 86e315ad..861a2994 100644 --- a/src/protocols/rdp/settings.c +++ b/src/protocols/rdp/settings.c @@ -18,12 +18,11 @@ */ #include "config.h" - #include "client.h" #include "common/string.h" #include "rdp.h" -#include "settings.h" #include "resolution.h" +#include "settings.h" #include #include diff --git a/src/protocols/rdp/settings.h b/src/protocols/rdp/settings.h index 92fc3b83..7679ae1e 100644 --- a/src/protocols/rdp/settings.h +++ b/src/protocols/rdp/settings.h @@ -17,15 +17,15 @@ * under the License. */ - -#ifndef __GUAC_RDP_SETTINGS_H -#define __GUAC_RDP_SETTINGS_H +#ifndef GUAC_RDP_SETTINGS_H +#define GUAC_RDP_SETTINGS_H #include "config.h" #include "keyboard/keymap.h" #include +#include /** * The maximum number of bytes in the client hostname claimed during diff --git a/src/protocols/rdp/status.h b/src/protocols/rdp/status.h index 6a2d5b6b..a624732f 100644 --- a/src/protocols/rdp/status.h +++ b/src/protocols/rdp/status.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef __GUAC_RDP_STATUS_H -#define __GUAC_RDP_STATUS_H +#ifndef GUAC_RDP_STATUS_H +#define GUAC_RDP_STATUS_H /** * RDP-specific status constants. diff --git a/src/protocols/rdp/stream.c b/src/protocols/rdp/stream.c index fedec507..3e7bdfaa 100644 --- a/src/protocols/rdp/stream.c +++ b/src/protocols/rdp/stream.c @@ -17,16 +17,15 @@ * under the License. */ - #include "config.h" #include "client.h" -#include "rdp.h" #include "fs.h" +#include "rdp.h" #include "stream.h" -#include #include #include +#include #include #include #include diff --git a/src/protocols/rdp/stream.h b/src/protocols/rdp/stream.h index 3ae8b0ff..3317c6cb 100644 --- a/src/protocols/rdp/stream.h +++ b/src/protocols/rdp/stream.h @@ -17,9 +17,8 @@ * under the License. */ - -#ifndef _GUAC_RDP_STREAM_H -#define _GUAC_RDP_STREAM_H +#ifndef GUAC_RDP_STREAM_H +#define GUAC_RDP_STREAM_H #include "config.h" #include "common/json.h" diff --git a/src/protocols/rdp/unicode.c b/src/protocols/rdp/unicode.c index 628615ac..5369f4c4 100644 --- a/src/protocols/rdp/unicode.c +++ b/src/protocols/rdp/unicode.c @@ -19,10 +19,10 @@ #include "config.h" -#include - #include +#include + void guac_rdp_utf16_to_utf8(const unsigned char* utf16, int length, char* utf8, int size) { diff --git a/src/protocols/rdp/user.c b/src/protocols/rdp/user.c index f2569f41..a22d138b 100644 --- a/src/protocols/rdp/user.c +++ b/src/protocols/rdp/user.c @@ -18,15 +18,14 @@ */ #include "config.h" - #include "channels/audio-input.h" +#include "channels/pipe-svc.h" #include "common/display.h" #include "input.h" -#include "user.h" -#include "channels/pipe-svc.h" #include "rdp.h" #include "settings.h" #include "stream.h" +#include "user.h" #ifdef ENABLE_COMMON_SSH #include "sftp.h"