[Spice-devel] [PATCH 1/2] unify header include order

Frediano Ziglio fziglio at redhat.com
Tue May 10 13:23:04 UTC 2016 

Use this style for include headers inside headers:

  #include <system_headers.h>
  #include <no_spice_no_system_libraries.h>
  #include <spice_protocol.h>
  #include <spice_common.h>

  #include "spice_server.h"

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 server/cache-item.h         | 3 ++-
 server/dcc-encoders.h       | 1 +
 server/dispatcher.h         | 1 +
 server/display-channel.h    | 1 -
 server/glz-encoder.h        | 3 ++-
 server/image-cache.h        | 1 -
 server/main-channel.h       | 1 +
 server/main-dispatcher.h    | 2 +-
 server/memslot.h            | 4 ++--
 server/migration-protocol.h | 1 +
 server/red-channel.h        | 1 -
 server/red-common.h         | 4 ++--
 server/red-parse-qxl.h      | 1 +
 server/red-record-qxl.h     | 1 +
 server/red-replay-qxl.h     | 3 ++-
 server/reds-stream.h        | 9 ++++-----
 server/reds.h               | 4 +---
 server/stream.h             | 3 ++-
 server/tree.h               | 1 +
 19 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/server/cache-item.h b/server/cache-item.h
index f72c0ff..d14e9a3 100644
--- a/server/cache-item.h
+++ b/server/cache-item.h
@@ -18,9 +18,10 @@
 #ifndef CACHE_ITEM_H_
 # define CACHE_ITEM_H_
 
-#include "red-channel.h"
 #include <common/ring.h>
 
+#include "red-channel.h"
+
 typedef struct RedCacheItem RedCacheItem;
 
 struct RedCacheItem {
diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h
index 14759c5..84f9f93 100644
--- a/server/dcc-encoders.h
+++ b/server/dcc-encoders.h
@@ -21,6 +21,7 @@
 #include <setjmp.h>
 #include <common/marshaller.h>
 #include <common/quic.h>
+
 #include "red-channel.h"
 #include "red-parse-qxl.h"
 #include "image-cache.h"
diff --git a/server/dispatcher.h b/server/dispatcher.h
index caaebc5..07b1137 100644
--- a/server/dispatcher.h
+++ b/server/dispatcher.h
@@ -19,6 +19,7 @@
 #define DISPATCHER_H
 
 #include <glib-object.h>
+
 #include "red-common.h"
 
 #define TYPE_DISPATCHER dispatcher_get_type()
diff --git a/server/display-channel.h b/server/display-channel.h
index 1d20be0..76668de 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -19,7 +19,6 @@
 # define DISPLAY_CHANNEL_H_
 
 #include <setjmp.h>
-
 #include <common/rect.h>
 #include <common/sw_canvas.h>
 
diff --git a/server/glz-encoder.h b/server/glz-encoder.h
index 6f4f44d..acc32b2 100644
--- a/server/glz-encoder.h
+++ b/server/glz-encoder.h
@@ -20,8 +20,9 @@
 
 /* Manging the lz encoding using a dictionary that is shared among encoders */
 
-#include "red-common.h"
 #include <common/lz_common.h>
+
+#include "red-common.h"
 #include "glz-encoder-dict.h"
 
 struct GlzEncoderUsrContext {
diff --git a/server/image-cache.h b/server/image-cache.h
index f61aeb4..38a318e 100644
--- a/server/image-cache.h
+++ b/server/image-cache.h
@@ -19,7 +19,6 @@
 #define IMAGE_CACHE_H_
 
 #include <inttypes.h>
-
 #include <common/pixman_utils.h>
 #include <common/canvas_base.h>
 #include <common/ring.h>
diff --git a/server/main-channel.h b/server/main-channel.h
index 473ed6f..4eb9a9c 100644
--- a/server/main-channel.h
+++ b/server/main-channel.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <spice/vd_agent.h>
 #include <common/marshaller.h>
+
 #include "red-channel.h"
 
 // TODO: Defines used to calculate receive buffer size, and also by reds.c
diff --git a/server/main-dispatcher.h b/server/main-dispatcher.h
index ffe82c8..9a425de 100644
--- a/server/main-dispatcher.h
+++ b/server/main-dispatcher.h
@@ -18,7 +18,7 @@
 #ifndef MAIN_DISPATCHER_H
 #define MAIN_DISPATCHER_H
 
-#include <spice.h>
+#include "spice.h"
 #include "dispatcher.h"
 #include "red-channel.h"
 
diff --git a/server/memslot.h b/server/memslot.h
index 0caa627..a29837c 100644
--- a/server/memslot.h
+++ b/server/memslot.h
@@ -19,10 +19,10 @@
 #ifndef MEMSLOT_H_
 #define MEMSLOT_H_
 
-#include "red-common.h"
-
 #include <spice/qxl_dev.h>
 
+#include "red-common.h"
+
 typedef struct MemSlot {
     int generation;
     unsigned long virt_start_addr;
diff --git a/server/migration-protocol.h b/server/migration-protocol.h
index c1d97ef..16eafbe 100644
--- a/server/migration-protocol.h
+++ b/server/migration-protocol.h
@@ -20,6 +20,7 @@
 
 #include <spice/macros.h>
 #include <spice/vd_agent.h>
+
 #include "glz-encoder-dict.h"
 
 /* ************************************************
diff --git a/server/red-channel.h b/server/red-channel.h
index bc225c6..03e6407 100644
--- a/server/red-channel.h
+++ b/server/red-channel.h
@@ -24,7 +24,6 @@
 
 #include <pthread.h>
 #include <limits.h>
-
 #include <common/ring.h>
 #include <common/marshaller.h>
 
diff --git a/server/red-common.h b/server/red-common.h
index 3a63f04..b92bbee 100644
--- a/server/red-common.h
+++ b/server/red-common.h
@@ -18,14 +18,14 @@
 #ifndef _H_RED_COMMON
 #define _H_RED_COMMON
 
-#include <glib.h>
-
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <glib.h>
+
 #include <spice/macros.h>
 #include <common/log.h>
 #include <common/lz_common.h>
diff --git a/server/red-parse-qxl.h b/server/red-parse-qxl.h
index 9c30572..0749b88 100644
--- a/server/red-parse-qxl.h
+++ b/server/red-parse-qxl.h
@@ -20,6 +20,7 @@
 #define RED_ABI_TRANSLATE_H
 
 #include <spice/qxl_dev.h>
+
 #include "red-common.h"
 #include "memslot.h"
 
diff --git a/server/red-record-qxl.h b/server/red-record-qxl.h
index 21f0bc9..d5eaaa0 100644
--- a/server/red-record-qxl.h
+++ b/server/red-record-qxl.h
@@ -20,6 +20,7 @@
 #define RED_ABI_RECORD_H
 
 #include <spice/qxl_dev.h>
+
 #include "red-common.h"
 #include "memslot.h"
 
diff --git a/server/red-replay-qxl.h b/server/red-replay-qxl.h
index a89b3d4..c9e074d 100644
--- a/server/red-replay-qxl.h
+++ b/server/red-replay-qxl.h
@@ -20,7 +20,8 @@
 
 #include <stdio.h>
 #include <spice/qxl_dev.h>
-#include <spice.h>
+
+#include "spice.h"
 
 typedef struct SpiceReplay SpiceReplay;
 
diff --git a/server/reds-stream.h b/server/reds-stream.h
index 7392f56..a8d1736 100644
--- a/server/reds-stream.h
+++ b/server/reds-stream.h
@@ -18,13 +18,12 @@
 #ifndef _H_REDS_STREAM
 #define _H_REDS_STREAM
 
-#include "spice.h"
-#include <common/mem.h>
-#include "red-common.h"
-
 #include <stdbool.h>
-
 #include <openssl/ssl.h>
+#include <common/mem.h>
+
+#include "spice.h"
+#include "red-common.h"
 
 typedef void (*AsyncReadDone)(void *opaque);
 typedef void (*AsyncReadError)(void *opaque, int err);
diff --git a/server/reds.h b/server/reds.h
index efb46a0..ec1ea59 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -21,11 +21,9 @@
 #include <stdint.h>
 #include <sys/uio.h>
 #include <spice/vd_agent.h>
-#include <config.h>
-
-
 #include <common/marshaller.h>
 #include <common/messages.h>
+
 #include "char-device.h"
 #include "spice.h"
 #include "red-channel.h"
diff --git a/server/stream.h b/server/stream.h
index 011467b..3c8d761 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -19,9 +19,10 @@
 #define STREAM_H_
 
 #include <glib.h>
+#include <common/region.h>
+
 #include "utils.h"
 #include "video-encoder.h"
-#include <common/region.h>
 #include "red-channel.h"
 #include "image-cache.h"
 
diff --git a/server/tree.h b/server/tree.h
index 6476082..5260ce8 100644
--- a/server/tree.h
+++ b/server/tree.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <common/region.h>
 #include <common/ring.h>
+
 #include "spice-bitmap-utils.h"
 
 enum {
-- 
2.5.5

More information about the Spice-devel mailing list