[PATCH xserver 12/19] xfree86: Fix up some bad indentation

Adam Jackson ajax at redhat.com
Mon Jan 23 19:32:26 UTC 2017


indent(1) gets confused by function-like macros with no trailing
semicolon, which is fair enough really.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/common/xf86Configure.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 59d275e..8c8e49e 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -157,7 +157,7 @@ configureInputSection(void)
 {
     XF86ConfInputPtr mouse = NULL;
 
-    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
+    parsePrologue(XF86ConfInputPtr, XF86ConfInputRec);
 
     ptr->inp_identifier = xnfstrdup("Keyboard0");
     ptr->inp_driver = xnfstrdup("kbd");
@@ -196,7 +196,7 @@ configureScreenSection(int screennum)
     int i;
     int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */  };
     char *tmp;
-    parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec)
+    parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec);
 
     XNFasprintf(&tmp, "Screen%d", screennum);
     ptr->scrn_identifier = tmp;
@@ -254,9 +254,9 @@ configureDeviceSection(int screennum)
     int i = 0;
     char *identifier;
 
-    parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec)
+    parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec);
 
-        /* Move device info to parser structure */
+    /* Move device info to parser structure */
    if (asprintf(&identifier, "Card%d", screennum) == -1)
         identifier = NULL;
     ptr->dev_identifier = identifier;
@@ -326,9 +326,9 @@ configureLayoutSection(void)
 {
     int scrnum = 0;
 
-    parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec)
+    parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec);
 
-        ptr->lay_identifier = "X.org Configured";
+    ptr->lay_identifier = "X.org Configured";
 
     {
         XF86ConfInputrefPtr iptr;
@@ -389,9 +389,9 @@ configureLayoutSection(void)
 static XF86ConfFlagsPtr
 configureFlagsSection(void)
 {
-    parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec)
+    parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec);
 
-        return ptr;
+    return ptr;
 }
 
 static XF86ConfModulePtr
@@ -405,9 +405,9 @@ configureModuleSection(void)
         "fonts",
         NULL
     };
-    parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec)
+    parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec);
 
-        elist = LoaderListDirs(esubdirs, NULL);
+    elist = LoaderListDirs(esubdirs, NULL);
     if (elist) {
         for (el = elist; *el; el++) {
             XF86LoadPtr module;
@@ -427,9 +427,9 @@ configureModuleSection(void)
 static XF86ConfFilesPtr
 configureFilesSection(void)
 {
-    parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
+    parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec);
 
-        if (xf86ModulePath)
+    if (xf86ModulePath)
         ptr->file_modulepath = xnfstrdup(xf86ModulePath);
     if (defaultFontPath)
         ptr->file_fontpath = xnfstrdup(defaultFontPath);
@@ -441,7 +441,7 @@ static XF86ConfMonitorPtr
 configureMonitorSection(int screennum)
 {
     char *tmp;
-    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
+    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec);
 
     XNFasprintf(&tmp, "Monitor%d", screennum);
     ptr->mon_identifier = tmp;
@@ -486,7 +486,7 @@ configureDDCMonitorSection(int screennum)
     int displaySizeLen;
     char *tmp;
 
-    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
+    parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec);
 
     XNFasprintf(&tmp, "Monitor%d", screennum);
     ptr->mon_identifier = tmp;
-- 
2.9.3



More information about the xorg-devel mailing list