Land part 2 of clang-format changes

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

2 files changed, 103 insertions, 97 deletions

diff --git a/tests/bugs/posix/bug-1175711.c b/tests/bugs/posix/bug-1175711.c
index fbbea3f636b..8ab193c4014 100644
--- a/tests/bugs/posix/bug-1175711.c
+++ b/tests/bugs/posix/bug-1175711.c
@@ -6,32 +6,32 @@
 int
 main(int argc, char **argv)
 {
-        DIR *dir = NULL;
-        struct dirent *entry = NULL;
-        int ret = 0;
-        char *path = NULL;
+    DIR *dir = NULL;
+    struct dirent *entry = NULL;
+    int ret = 0;
+    char *path = NULL;
 
-        assert (argc == 2);
-        path = argv[1];
+    assert(argc == 2);
+    path = argv[1];
 
-        dir = opendir(path);
-        if (!dir) {
-                printf("opendir(%s) failed.\n", path);
-                return -1;
-        }
+    dir = opendir(path);
+    if (!dir) {
+        printf("opendir(%s) failed.\n", path);
+        return -1;
+    }
 
 #ifdef _DIRENT_HAVE_D_TYPE
-        while ((entry = readdir(dir)) != NULL) {
-                if (entry->d_type == DT_UNKNOWN) {
-                        printf("d_type found to be DT_UNKNOWN\n");
-                        ret = -1;
-                        break;
-                }
+    while ((entry = readdir(dir)) != NULL) {
+        if (entry->d_type == DT_UNKNOWN) {
+            printf("d_type found to be DT_UNKNOWN\n");
+            ret = -1;
+            break;
         }
+    }
 #endif
 
-        if (dir)
-                closedir(dir);
+    if (dir)
+        closedir(dir);
 
-        return ret;
+    return ret;
 }
diff --git a/tests/bugs/posix/disallow-gfid-volumeid-fremovexattr.c b/tests/bugs/posix/disallow-gfid-volumeid-fremovexattr.c
index 325edbbed97..4ed3181d48f 100644
--- a/tests/bugs/posix/disallow-gfid-volumeid-fremovexattr.c
+++ b/tests/bugs/posix/disallow-gfid-volumeid-fremovexattr.c
@@ -5,94 +5,100 @@
 #include <string.h>
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        glfs_t    *fs       = NULL;
-        int       ret       = 0;
-        int       i         = 0;
-        glfs_fd_t *fd       = NULL;
-        char      *logfile  = NULL;
-        char      *hostname = NULL;
+    glfs_t *fs = NULL;
+    int ret = 0;
+    int i = 0;
+    glfs_fd_t *fd = NULL;
+    char *logfile = NULL;
+    char *hostname = NULL;
 
-        if (argc != 4) {
-                fprintf (stderr,
-                        "Expect following args %s <hostname> <Vol> <log file>\n"
-                        , argv[0]);
-                return -1;
-        }
+    if (argc != 4) {
+        fprintf(stderr,
+                "Expect following args %s <hostname> <Vol> <log file>\n",
+                argv[0]);
+        return -1;
+    }
 
-        hostname = argv[1];
-        logfile = argv[3];
+    hostname = argv[1];
+    logfile = argv[3];
 
-        fs = glfs_new (argv[2]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL (%s)\n",
-                        strerror (errno));
-                return -1;
-        }
+    fs = glfs_new(argv[2]);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL (%s)\n", strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_set_volfile_server failed ret:%d (%s)\n",
-                ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_set_volfile_server failed ret:%d (%s)\n", ret,
+                strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_set_logging (fs, logfile, 7);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_set_logging failed with ret: %d (%s)\n",
-                        ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_set_logging(fs, logfile, 7);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_set_logging failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_init (fs);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_init failed with ret: %d (%s)\n",
-                        ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_init(fs);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_init failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        return -1;
+    }
 
-        fd = glfs_opendir (fs, "/");
-        if (!fd) {
-                fprintf (stderr, "glfs_opendir failed with (%s)\n",
-                         strerror (errno));
-                return -1;
-        }
+    fd = glfs_opendir(fs, "/");
+    if (!fd) {
+        fprintf(stderr, "glfs_opendir failed with (%s)\n", strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_fremovexattr (fd, "trusted.gfid");
-        if (ret == 0 || errno != EPERM) {
-                fprintf (stderr, "glfs_fremovexattr gfid exited with ret: "
-                         "%d (%s)\n", ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_fremovexattr(fd, "trusted.gfid");
+    if (ret == 0 || errno != EPERM) {
+        fprintf(stderr,
+                "glfs_fremovexattr gfid exited with ret: "
+                "%d (%s)\n",
+                ret, strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_fremovexattr (fd, "trusted.glusterfs.volume-id");
-        if (ret == 0 || errno != EPERM) {
-                fprintf (stderr, "glfs_fremovexattr volume-id exited with ret: "
-                         "%d (%s)\n", ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_fremovexattr(fd, "trusted.glusterfs.volume-id");
+    if (ret == 0 || errno != EPERM) {
+        fprintf(stderr,
+                "glfs_fremovexattr volume-id exited with ret: "
+                "%d (%s)\n",
+                ret, strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_fsetxattr (fd, "trusted.abc", "abc", 3, 0);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fsetxattr trusted.abc exited with ret: "
-                         "%d (%s)\n", ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_fsetxattr(fd, "trusted.abc", "abc", 3, 0);
+    if (ret < 0) {
+        fprintf(stderr,
+                "glfs_fsetxattr trusted.abc exited with ret: "
+                "%d (%s)\n",
+                ret, strerror(errno));
+        return -1;
+    }
 
-        ret = glfs_fremovexattr (fd, "trusted.abc");
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fremovexattr trusted.abc exited with "
-                         "ret: %d (%s)\n", ret, strerror (errno));
-                return -1;
-        }
+    ret = glfs_fremovexattr(fd, "trusted.abc");
+    if (ret < 0) {
+        fprintf(stderr,
+                "glfs_fremovexattr trusted.abc exited with "
+                "ret: %d (%s)\n",
+                ret, strerror(errno));
+        return -1;
+    }
 
-        (void) glfs_closedir(fd);
-        ret = glfs_fini (fs);
-        if (ret < 0) {
-                fprintf (stderr, "glfs_fini failed with ret: %d (%s)\n",
-                        ret, strerror (errno));
-                return -1;
-        }
-        return 0;
+    (void)glfs_closedir(fd);
+    ret = glfs_fini(fs);
+    if (ret < 0) {
+        fprintf(stderr, "glfs_fini failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        return -1;
+    }
+    return 0;
 }