Land part 2 of clang-format changes

Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4
Signed-off-by: Nigel Babu <nigelb@redhat.com>

2 files changed, 72 insertions, 76 deletions

diff --git a/tests/bugs/distribute/bug-1193636.c b/tests/bugs/distribute/bug-1193636.c
index 438efa8e686..ea3f79a4e06 100644
--- a/tests/bugs/distribute/bug-1193636.c
+++ b/tests/bugs/distribute/bug-1193636.c
@@ -5,66 +5,64 @@
 #include <fcntl.h>
 #include <string.h>
 
+#define MY_XATTR_NAME "user.ftest"
+#define MY_XATTR_VAL "ftestval"
 
-#define MY_XATTR_NAME   "user.ftest"
-#define MY_XATTR_VAL    "ftestval"
-
-
-void usage (void)
+void
+usage(void)
 {
-        printf ("Usage : bug-1193636 <filename> <xattr_name> <op>\n");
-        printf ("   op : 0 - set, 1 - remove\n");
+    printf("Usage : bug-1193636 <filename> <xattr_name> <op>\n");
+    printf("   op : 0 - set, 1 - remove\n");
 }
 
-
-int main (int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-        int fd;
-        int err = 0;
-        char *xattr_name = NULL;
-        int op = 0;
-
-        if (argc != 4) {
-                usage ();
-                exit (1);
-        }
-
-        op = atoi (argv[3]);
-
-        if ((op != 0) && (op != 1)) {
-                printf ("Invalid operation specified.\n");
-                usage ();
-                exit (1);
+    int fd;
+    int err = 0;
+    char *xattr_name = NULL;
+    int op = 0;
+
+    if (argc != 4) {
+        usage();
+        exit(1);
+    }
+
+    op = atoi(argv[3]);
+
+    if ((op != 0) && (op != 1)) {
+        printf("Invalid operation specified.\n");
+        usage();
+        exit(1);
+    }
+
+    xattr_name = argv[2];
+
+    fd = open(argv[1], O_RDWR);
+    if (fd == -1) {
+        printf("Failed to open file %s\n", argv[1]);
+        exit(1);
+    }
+
+    if (!op) {
+        err = fsetxattr(fd, xattr_name, MY_XATTR_VAL, strlen(MY_XATTR_VAL) + 1,
+                        XATTR_CREATE);
+
+        if (err) {
+            printf("Failed to set xattr %s: %m\n", xattr_name);
+            exit(1);
         }
 
-        xattr_name = argv[2];
+    } else {
+        err = fremovexattr(fd, xattr_name);
 
-        fd = open(argv[1], O_RDWR);
-        if (fd == -1) {
-                printf ("Failed to open file %s\n", argv[1]);
-                exit (1);
+        if (err) {
+            printf("Failed to remove xattr %s: %m\n", xattr_name);
+            exit(1);
         }
+    }
 
-        if (!op) {
-                err = fsetxattr (fd, xattr_name, MY_XATTR_VAL,
-                                 strlen (MY_XATTR_VAL) + 1, XATTR_CREATE);
+    close(fd);
 
-                if (err) {
-                        printf ("Failed to set xattr %s: %m\n", xattr_name);
-                        exit (1);
-                }
-
-        } else {
-                err = fremovexattr (fd, xattr_name);
-
-                if (err) {
-                        printf ("Failed to remove xattr %s: %m\n", xattr_name);
-                        exit (1);
-                }
-        }
-
-        close (fd);
-
-        return 0;
+    return 0;
 }
-
diff --git a/tests/bugs/distribute/bug-860663.c b/tests/bugs/distribute/bug-860663.c
index bee4e7d40b1..ca0c31ffe8f 100644
--- a/tests/bugs/distribute/bug-860663.c
+++ b/tests/bugs/distribute/bug-860663.c
@@ -6,38 +6,36 @@
 #include <err.h>
 #include <sys/param.h>
 
-int
-main(argc, argv)
-        int argc;
-        char **argv;
+int main(argc, argv) int argc;
+char **argv;
 {
-        char *basepath;
-        char path[MAXPATHLEN + 1];
-        unsigned int count;
-        int i, fd;
+    char *basepath;
+    char path[MAXPATHLEN + 1];
+    unsigned int count;
+    int i, fd;
 
-        if (argc != 3)
-                errx(1, "usage: %s path count", argv[0]);
+    if (argc != 3)
+        errx(1, "usage: %s path count", argv[0]);
 
-        basepath = argv[1];
-        count = atoi(argv[2]);
+    basepath = argv[1];
+    count = atoi(argv[2]);
 
-        if (count > 999999)
-                errx(1, "count too big");
+    if (count > 999999)
+        errx(1, "count too big");
 
-        if (strlen(basepath) > MAXPATHLEN - 6)
-                errx(1, "path too long");
+    if (strlen(basepath) > MAXPATHLEN - 6)
+        errx(1, "path too long");
 
-        for (i = 0; i < count; i++) {
-                (void)sprintf(path, "%s%06d", basepath, i);
+    for (i = 0; i < count; i++) {
+        (void)sprintf(path, "%s%06d", basepath, i);
 
-                fd = open(path, O_CREAT|O_RDWR, 0644);
-                if (fd == -1)
-                        err(1, "create %s failed", path);
+        fd = open(path, O_CREAT | O_RDWR, 0644);
+        if (fd == -1)
+            err(1, "create %s failed", path);
 
-                if (close(fd) != 0)
-                        warn("close %s failed", path);
-        }
+        if (close(fd) != 0)
+            warn("close %s failed", path);
+    }
 
-        return 0;
+    return 0;
 }