xorg driver header cleanup

xorg/server/module/rdpMisc.h

@@ -87,7 +87,6 @@ g_hexdump(unsigned char *p, unsigned int len);
 #  error Unknown endianness in rdp.h
 #endif
 /* check if we need to align data */
-/* check if we need to align data */
 #if defined(__sparc__) || defined(__alpha__) || defined(__hppa__) || \
     defined(__AIX__) || defined(__PPC__) || defined(__mips__) || \
     defined(__ia64__) || defined(__ppc__) || defined(__arm__)
@@ -112,37 +111,37 @@ struct stream
 
 /******************************************************************************/
 #define s_push_layer(s, h, n) \
-{ \
+do {                          \
     (s)->h = (s)->p;          \
     (s)->p += (n);            \
-}
+} while (0)
 
 /******************************************************************************/
 #define s_pop_layer(s, h) \
-{ \
+do {                      \
     (s)->p = (s)->h;      \
-}
+} while (0)
 
 /******************************************************************************/
 #if defined(B_ENDIAN) || defined(NEED_ALIGN)
 #define out_uint16_le(s, v)                \
-{ \
+do {                                       \
     *((s)->p) = (unsigned char)((v) >> 0); \
     (s)->p++;                              \
     *((s)->p) = (unsigned char)((v) >> 8); \
     (s)->p++;                              \
-}
+} while (0)
 #else
 #define out_uint16_le(s, v)                             \
-{ \
+do {                                                    \
     *((unsigned short*)((s)->p)) = (unsigned short)(v); \
     (s)->p += 2;                                        \
-}
+} while (0)
 #endif
 
 /******************************************************************************/
 #define init_stream(s, v)                    \
-{ \
+do {                                         \
     if ((v) > (s)->size)                     \
     {                                        \
         g_free((s)->data);                   \
@@ -152,25 +151,32 @@ struct stream
     (s)->p = (s)->data;                      \
     (s)->end = (s)->data;                    \
     (s)->next_packet = 0;                    \
-}
+} while (0)
 
 /******************************************************************************/
 #define out_uint8p(s, v, n)     \
-{ \
+do {                            \
     g_memcpy((s)->p, (v), (n)); \
     (s)->p += (n);              \
-}
+} while (0)
 
 /******************************************************************************/
 #define out_uint8a(s, v, n)    \
-{ \
+do  {                          \
     out_uint8p((s), (v), (n)); \
-}
+} while (0)
+
+/******************************************************************************/
+#define out_uint8(s, v)                    \
+do {                                       \
+    *((s)->p) = (unsigned char)((v) >> 0); \
+    (s)->p++;                              \
+} while (0)
 
 /******************************************************************************/
 #if defined(B_ENDIAN) || defined(NEED_ALIGN)
 #define out_uint32_le(s, v)                 \
-{ \
+do {                                        \
     *((s)->p) = (unsigned char)((v) >> 0);  \
     (s)->p++;                               \
     *((s)->p) = (unsigned char)((v) >> 8);  \
@@ -179,19 +185,19 @@ struct stream
     (s)->p++;                               \
     *((s)->p) = (unsigned char)((v) >> 24); \
     (s)->p++;                               \
-}
+} while (0)
 #else
 #define out_uint32_le(s, v)           \
-{ \
+do {                                  \
     *((unsigned int*)((s)->p)) = (v); \
     (s)->p += 4;                      \
-}
+} while (0)
 #endif
 
 /******************************************************************************/
 #if defined(B_ENDIAN) || defined(NEED_ALIGN)
 #define in_uint32_le(s, v)                            \
-{ \
+do {                                                  \
     (v) = (unsigned int)                              \
         (                                             \
             (*((unsigned char*)((s)->p + 0)) << 0) |  \
@@ -200,49 +206,49 @@ struct stream
             (*((unsigned char*)((s)->p + 3)) << 24)   \
         );                                            \
     (s)->p += 4;                                      \
-}
+} while (0)
 #else
 #define in_uint32_le(s, v)            \
-{ \
+do {                                  \
     (v) = *((unsigned int*)((s)->p)); \
     (s)->p += 4;                      \
-}
+} while (0)
 #endif
 
 /******************************************************************************/
 #if defined(B_ENDIAN) || defined(NEED_ALIGN)
 #define in_uint16_le(s, v)                           \
-{ \
+do {                                                 \
     (v) = (unsigned short)                           \
         (                                            \
             (*((unsigned char*)((s)->p + 0)) << 0) | \
             (*((unsigned char*)((s)->p + 1)) << 8)   \
         );                                           \
     (s)->p += 2;                                     \
-}
+} while (0)
 #else
 #define in_uint16_le(s, v)              \
-{ \
+do {                                    \
     (v) = *((unsigned short*)((s)->p)); \
     (s)->p += 2;                        \
-}
+} while (0)
 #endif
 
 /******************************************************************************/
 #define s_mark_end(s)   \
-{ \
+do {                    \
     (s)->end = (s)->p;  \
-}
+} while (0)
 
 /******************************************************************************/
 #define make_stream(s)                                        \
-{ \
+do {                                                          \
     (s) = (struct stream*)g_malloc(sizeof(struct stream), 1); \
-}
+} while (0)
 
 /******************************************************************************/
-#define free_stream(s) do \
-{ \
+#define free_stream(s)     \
+do {                       \
     if ((s) != 0)          \
     {                      \
         g_free((s)->data); \