Land part 2 of clang-format changes

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

2 files changed, 158 insertions, 155 deletions

diff --git a/tests/bugs/io-cache/bug-858242.c b/tests/bugs/io-cache/bug-858242.c
index b6a412d578c..ac87a15533e 100644
--- a/tests/bugs/io-cache/bug-858242.c
+++ b/tests/bugs/io-cache/bug-858242.c
@@ -10,72 +10,75 @@
 #include <unistd.h>
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        char        *filename = NULL, *volname = NULL, *cmd = NULL;
-        char  buffer[1024]    = {0, };
-        int          fd       = -1;
-        int          ret      = -1;
-        struct stat  statbuf  = {0, };
+    char *filename = NULL, *volname = NULL, *cmd = NULL;
+    char buffer[1024] = {
+        0,
+    };
+    int fd = -1;
+    int ret = -1;
+    struct stat statbuf = {
+        0,
+    };
 
-        if (argc != 3) {
-                fprintf (stderr, "usage: %s <file-name> <volname>\n", argv[0]);
-                goto out;
-        }
+    if (argc != 3) {
+        fprintf(stderr, "usage: %s <file-name> <volname>\n", argv[0]);
+        goto out;
+    }
 
-        filename = argv[1];
-        volname = argv[2];
+    filename = argv[1];
+    volname = argv[2];
 
-        fd = open (filename, O_RDWR | O_CREAT, 0);
-        if (fd < 0) {
-                fprintf (stderr, "open (%s) failed (%s)\n", filename,
-                         strerror (errno));
-                goto out;
-        }
+    fd = open(filename, O_RDWR | O_CREAT, 0);
+    if (fd < 0) {
+        fprintf(stderr, "open (%s) failed (%s)\n", filename, strerror(errno));
+        goto out;
+    }
 
-        ret = write (fd, "test-content", 12);
-        if (ret < 0) {
-                fprintf (stderr, "write failed (%s)", strerror (errno));
-                goto out;
-        }
+    ret = write(fd, "test-content", 12);
+    if (ret < 0) {
+        fprintf(stderr, "write failed (%s)", strerror(errno));
+        goto out;
+    }
 
-        ret = fsync (fd);
-        if (ret < 0) {
-                fprintf (stderr, "fsync failed (%s)", strerror (errno));
-                goto out;
-        }
+    ret = fsync(fd);
+    if (ret < 0) {
+        fprintf(stderr, "fsync failed (%s)", strerror(errno));
+        goto out;
+    }
 
-        ret = fstat (fd, &statbuf);
-        if (ret < 0) {
-                fprintf (stderr, "fstat failed (%s)", strerror (errno));
-                goto out;
-        }
+    ret = fstat(fd, &statbuf);
+    if (ret < 0) {
+        fprintf(stderr, "fstat failed (%s)", strerror(errno));
+        goto out;
+    }
 
-        ret = asprintf (&cmd, "gluster --mode=script volume stop %s force",
-                        volname);
-        if (ret < 0) {
-                fprintf (stderr, "cannot construct cli command string (%s)",
-                         strerror (errno));
-                goto out;
-        }
+    ret = asprintf(&cmd, "gluster --mode=script volume stop %s force", volname);
+    if (ret < 0) {
+        fprintf(stderr, "cannot construct cli command string (%s)",
+                strerror(errno));
+        goto out;
+    }
 
-        ret = system (cmd);
-        if (ret < 0) {
-                fprintf (stderr, "stopping volume (%s) failed", volname);
-                goto out;
-        }
+    ret = system(cmd);
+    if (ret < 0) {
+        fprintf(stderr, "stopping volume (%s) failed", volname);
+        goto out;
+    }
 
-        sleep (3);
+    sleep(3);
 
-        ret = read (fd, buffer, 1024);
-        if (ret >= 0) {
-                fprintf (stderr, "read should've returned error, "
-                         "but is successful\n");
-                ret = -1;
-                goto out;
-        }
+    ret = read(fd, buffer, 1024);
+    if (ret >= 0) {
+        fprintf(stderr,
+                "read should've returned error, "
+                "but is successful\n");
+        ret = -1;
+        goto out;
+    }
 
-        ret = 0;
+    ret = 0;
 out:
-        return ret;
+    return ret;
 }
diff --git a/tests/bugs/io-cache/bug-read-hang.c b/tests/bugs/io-cache/bug-read-hang.c
index 7709a41719d..e1fae97e7e8 100644
--- a/tests/bugs/io-cache/bug-read-hang.c
+++ b/tests/bugs/io-cache/bug-read-hang.c
@@ -9,117 +9,117 @@
 
 int count = 0;
 void
-read_cbk (glfs_fd_t *fd, ssize_t ret, void *data) {
-count++;
+read_cbk(glfs_fd_t *fd, ssize_t ret, void *data)
+{
+    count++;
 }
 
 glfs_t *
 setup_new_client(char *hostname, char *volname, char *log_file, int flag)
 {
-        int ret = 0;
-        glfs_t *fs = NULL;
-
-        fs = glfs_new (volname);
-        if (!fs) {
-                fprintf (stderr, "\nglfs_new: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        ret = glfs_set_logging (fs, log_file, 7);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_set_logging failed with ret: %d (%s)\n",
-                                 ret, strerror (errno));
-                goto error;
-        }
-
-        if (flag == NO_INIT)
-                goto out;
-
-        ret = glfs_init (fs);
-        if (ret < 0) {
-                fprintf (stderr, "\nglfs_init failed with ret: %d (%s)\n",
-                                  ret, strerror (errno));
-                goto error;
-        }
+    int ret = 0;
+    glfs_t *fs = NULL;
+
+    fs = glfs_new(volname);
+    if (!fs) {
+        fprintf(stderr, "\nglfs_new: returned NULL (%s)\n", strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_volfile_server failed ret:%d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    ret = glfs_set_logging(fs, log_file, 7);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_set_logging failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
+
+    if (flag == NO_INIT)
+        goto out;
+
+    ret = glfs_init(fs);
+    if (ret < 0) {
+        fprintf(stderr, "\nglfs_init failed with ret: %d (%s)\n", ret,
+                strerror(errno));
+        goto error;
+    }
 
 out:
-        return fs;
+    return fs;
 error:
-        return NULL;
+    return NULL;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int        ret         = 0;
-        glfs_t    *fs          = NULL;
-        struct glfs_fd *fd     = NULL;
-        char      *volname     = NULL;
-        char      *log_file    = NULL;
-        char      *hostname    = NULL;
-        char      *buf = NULL;
-        struct stat stat;
-
-        if (argc != 4) {
-                fprintf (stderr,
-                                "Expect following args %s <hostname> <Vol> <log file location>\n"
-                                , argv[0]);
-                return -1;
-        }
-
-        hostname = argv[1];
-        volname = argv[2];
-        log_file = argv[3];
-
-        fs = setup_new_client (hostname, volname, log_file, 0);
-        if (!fs) {
-                fprintf (stderr, "\nsetup_new_client: returned NULL (%s)\n",
-                                 strerror (errno));
-                goto error;
-        }
-
-        fd = glfs_opendir (fs, "/");
-        if (!fd) {
-                fprintf (stderr, "/: %s\n", strerror (errno));
-                return -1;
-        }
-
-        glfs_readdirplus (fd, &stat);
-
-        fd = glfs_open (fs, "/test", O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_open: returned NULL\n");
-                goto error;
-        }
-
-        buf = (char *) malloc (5);
-
-        ret = glfs_pread (fd, buf, 5, 0, 0, NULL);
-        if (ret < 0) {
-                fprintf (stderr, "Read(%s): %d (%s)\n", "test", ret,
-                         strerror (errno));
-                return ret;
-        }
-
-        free (buf);
-        glfs_close (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;
-error:
+    int ret = 0;
+    glfs_t *fs = NULL;
+    struct glfs_fd *fd = NULL;
+    char *volname = NULL;
+    char *log_file = NULL;
+    char *hostname = NULL;
+    char *buf = NULL;
+    struct stat stat;
+
+    if (argc != 4) {
+        fprintf(
+            stderr,
+            "Expect following args %s <hostname> <Vol> <log file location>\n",
+            argv[0]);
+        return -1;
+    }
+
+    hostname = argv[1];
+    volname = argv[2];
+    log_file = argv[3];
+
+    fs = setup_new_client(hostname, volname, log_file, 0);
+    if (!fs) {
+        fprintf(stderr, "\nsetup_new_client: returned NULL (%s)\n",
+                strerror(errno));
+        goto error;
+    }
+
+    fd = glfs_opendir(fs, "/");
+    if (!fd) {
+        fprintf(stderr, "/: %s\n", strerror(errno));
+        return -1;
+    }
+
+    glfs_readdirplus(fd, &stat);
+
+    fd = glfs_open(fs, "/test", O_RDWR);
+    if (fd == NULL) {
+        fprintf(stderr, "glfs_open: returned NULL\n");
+        goto error;
+    }
+
+    buf = (char *)malloc(5);
+
+    ret = glfs_pread(fd, buf, 5, 0, 0, NULL);
+    if (ret < 0) {
+        fprintf(stderr, "Read(%s): %d (%s)\n", "test", ret, strerror(errno));
+        return ret;
+    }
+
+    free(buf);
+    glfs_close(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;
+error:
+    return -1;
 }