Land part 2 of clang-format changes

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

4 files changed, 318 insertions, 307 deletions

diff --git a/tests/bugs/shard/bug-shard-discard.c b/tests/bugs/shard/bug-shard-discard.c
index b1268278fa5..15dca6c2181 100644
--- a/tests/bugs/shard/bug-shard-discard.c
+++ b/tests/bugs/shard/bug-shard-discard.c
@@ -4,63 +4,66 @@
 #include <glusterfs/api/glfs-handles.h>
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int        ret = 0;
-        off_t      off = 0;
-        size_t     len = 0;
-        glfs_t    *fs  = NULL;
-        glfs_fd_t *fd  = NULL;
+    int ret = 0;
+    off_t off = 0;
+    size_t len = 0;
+    glfs_t *fs = NULL;
+    glfs_fd_t *fd = NULL;
 
-        if (argc != 7) {
-                fprintf (stderr, "Syntax: %s <host> <volname> <file-path> <off> <len> <log-file>\n", argv[0]);
-                return 1;
-        }
+    if (argc != 7) {
+        fprintf(
+            stderr,
+            "Syntax: %s <host> <volname> <file-path> <off> <len> <log-file>\n",
+            argv[0]);
+        return 1;
+    }
 
-        fs = glfs_new (argv[2]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                return 1;
-        }
+    fs = glfs_new(argv[2]);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        return 1;
+    }
 
-        ret = glfs_set_volfile_server (fs, "tcp", argv[1], 24007);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_volfile_server: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_set_volfile_server(fs, "tcp", argv[1], 24007);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_volfile_server: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = glfs_set_logging (fs, argv[6], 7);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_logging: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_set_logging(fs, argv[6], 7);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_logging: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = glfs_init (fs);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_init: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_init(fs);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_init: returned %d\n", ret);
+        goto out;
+    }
 
-        fd = glfs_open (fs, argv[3], O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_open: returned NULL\n");
-                goto out;
-        }
+    fd = glfs_open(fs, argv[3], O_RDWR);
+    if (fd == NULL) {
+        fprintf(stderr, "glfs_open: returned NULL\n");
+        goto out;
+    }
 
-        off = atoi (argv[4]);
-        len = atoi (argv[5]);
+    off = atoi(argv[4]);
+    len = atoi(argv[5]);
 
-        ret = glfs_discard (fd, off, len);
-        if (ret <= 0) {
-                fprintf (stderr, "glfs_discard: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_discard(fd, off, len);
+    if (ret <= 0) {
+        fprintf(stderr, "glfs_discard: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = 0;
+    ret = 0;
 
 out:
-        if (fd)
-                glfs_close (fd);
-        glfs_fini (fs);
-        return ret;
+    if (fd)
+        glfs_close(fd);
+    glfs_fini(fs);
+    return ret;
 }
diff --git a/tests/bugs/shard/bug-shard-zerofill.c b/tests/bugs/shard/bug-shard-zerofill.c
index c0525a58afc..ed4c8c54dc2 100644
--- a/tests/bugs/shard/bug-shard-zerofill.c
+++ b/tests/bugs/shard/bug-shard-zerofill.c
@@ -3,57 +3,58 @@
 #include <glusterfs/api/glfs-handles.h>
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        glfs_t    *fs = NULL;
-        glfs_fd_t *fd = NULL;
-        int        ret = 1;
-
-        if (argc != 5) {
-                fprintf (stderr, "Syntax: %s <host> <volname> <file-path> <log-file>\n", argv[0]);
-                return 1;
-        }
-
-        fs = glfs_new (argv[2]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                return 1;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", argv[1], 24007);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_volfile_server: returned %d\n", ret);
-                goto out;
-        }
-        ret = glfs_set_logging (fs, argv[4], 7);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_logging: returned %d\n", ret);
-                goto out;
-        }
-        ret = glfs_init (fs);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_init: returned %d\n", ret);
-                goto out;
-        }
-
-        fd = glfs_open (fs, argv[3], O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_open: returned NULL\n");
-                goto out;
-        }
-
-        /* Zero-fill "foo" with 10MB of data */
-        ret = glfs_zerofill (fd, 0, 10485760);
-        if (ret <= 0) {
-                fprintf (stderr, "glfs_zerofill: returned %d\n", ret);
-                goto out;
-        }
-
-        ret = 0;
+    glfs_t *fs = NULL;
+    glfs_fd_t *fd = NULL;
+    int ret = 1;
+
+    if (argc != 5) {
+        fprintf(stderr, "Syntax: %s <host> <volname> <file-path> <log-file>\n",
+                argv[0]);
+        return 1;
+    }
+
+    fs = glfs_new(argv[2]);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        return 1;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", argv[1], 24007);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_volfile_server: returned %d\n", ret);
+        goto out;
+    }
+    ret = glfs_set_logging(fs, argv[4], 7);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_logging: returned %d\n", ret);
+        goto out;
+    }
+    ret = glfs_init(fs);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_init: returned %d\n", ret);
+        goto out;
+    }
+
+    fd = glfs_open(fs, argv[3], O_RDWR);
+    if (fd == NULL) {
+        fprintf(stderr, "glfs_open: returned NULL\n");
+        goto out;
+    }
+
+    /* Zero-fill "foo" with 10MB of data */
+    ret = glfs_zerofill(fd, 0, 10485760);
+    if (ret <= 0) {
+        fprintf(stderr, "glfs_zerofill: returned %d\n", ret);
+        goto out;
+    }
+
+    ret = 0;
 
 out:
-        if (fd)
-                glfs_close(fd);
-        glfs_fini (fs);
-        return ret;
+    if (fd)
+        glfs_close(fd);
+    glfs_fini(fs);
+    return ret;
 }
diff --git a/tests/bugs/shard/shard-append-test.c b/tests/bugs/shard/shard-append-test.c
index 92dff3d078d..c7debb2b182 100644
--- a/tests/bugs/shard/shard-append-test.c
+++ b/tests/bugs/shard/shard-append-test.c
@@ -10,9 +10,10 @@
 #include <glusterfs/api/glfs.h>
 #include <glusterfs/api/glfs-handles.h>
 
-#define LOG_ERR(msg) do { \
-        fprintf (stderr, "%s : Error (%s)\n", msg, strerror (errno)); \
-        } while (0)
+#define LOG_ERR(msg)                                                           \
+    do {                                                                       \
+        fprintf(stderr, "%s : Error (%s)\n", msg, strerror(errno));            \
+    } while (0)
 
 /*This test tests that shard xlator handles offset in appending writes
  * correctly. This test performs writes of 1025 bytes 1025 times, in 5 threads
@@ -26,154 +27,157 @@ pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 int thread_data = '1';
 
 glfs_t *
-init_glfs (const char *hostname, const char *volname,
-           const char *logfile)
+init_glfs(const char *hostname, const char *volname, const char *logfile)
 {
-        int     ret     = -1;
-        glfs_t *fs      = NULL;
+    int ret = -1;
+    glfs_t *fs = NULL;
 
-        fs = glfs_new (volname);
-        if (!fs) {
-                LOG_ERR ("glfs_new failed");
-                return NULL;
-        }
-
-        ret = glfs_set_volfile_server (fs, "tcp", hostname, 24007);
-        if (ret < 0) {
-                LOG_ERR ("glfs_set_volfile_server failed");
-                goto out;
-        }
-
-        ret = glfs_set_logging (fs, logfile, 7);
-        if (ret < 0) {
-                LOG_ERR ("glfs_set_logging failed");
-                goto out;
-        }
-
-        ret = glfs_init (fs);
-        if (ret < 0) {
-                LOG_ERR ("glfs_init failed");
-                goto out;
-        }
-
-        ret = 0;
+    fs = glfs_new(volname);
+    if (!fs) {
+        LOG_ERR("glfs_new failed");
+        return NULL;
+    }
+
+    ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007);
+    if (ret < 0) {
+        LOG_ERR("glfs_set_volfile_server failed");
+        goto out;
+    }
+
+    ret = glfs_set_logging(fs, logfile, 7);
+    if (ret < 0) {
+        LOG_ERR("glfs_set_logging failed");
+        goto out;
+    }
+
+    ret = glfs_init(fs);
+    if (ret < 0) {
+        LOG_ERR("glfs_init failed");
+        goto out;
+    }
+
+    ret = 0;
 out:
-        if (ret) {
-                glfs_fini (fs);
-                fs = NULL;
-        }
+    if (ret) {
+        glfs_fini(fs);
+        fs = NULL;
+    }
 
-        return fs;
+    return fs;
 }
 
-void*
-write_data (void *data)
+void *
+write_data(void *data)
 {
-        char           buf[1025] = {0};
-        glfs_fd_t      *glfd = NULL;
-        glfs_t         *fs       = data;
-        int            i     = 0;
-
-        pthread_mutex_lock (&lock);
-        {
-                memset(buf, thread_data, sizeof(buf));
-                thread_data++;
+    char buf[1025] = {0};
+    glfs_fd_t *glfd = NULL;
+    glfs_t *fs = data;
+    int i = 0;
+
+    pthread_mutex_lock(&lock);
+    {
+        memset(buf, thread_data, sizeof(buf));
+        thread_data++;
+    }
+    pthread_mutex_unlock(&lock);
+
+    for (i = 0; i < 1025; i++) {
+        glfd = glfs_creat(fs, "parallel-write.txt", O_WRONLY | O_APPEND,
+                          S_IRUSR | S_IWUSR | O_SYNC);
+        if (!glfd) {
+            LOG_ERR("Failed to create file");
+            exit(1);
         }
-        pthread_mutex_unlock (&lock);
-
-        for (i = 0; i < 1025; i++) {
-                glfd = glfs_creat(fs, "parallel-write.txt", O_WRONLY | O_APPEND,
-                                   S_IRUSR | S_IWUSR | O_SYNC);
-                if (!glfd) {
-                        LOG_ERR ("Failed to create file");
-                        exit(1);
-                }
-
-                if (glfs_write (glfd, buf, sizeof(buf), 0) < 0) {
-                        LOG_ERR ("Failed to write to file");
-                        exit(1);
-                }
-                if (glfs_close(glfd) != 0) {
-                        LOG_ERR ("Failed to close file");
-                        exit(1);
-                }
+
+        if (glfs_write(glfd, buf, sizeof(buf), 0) < 0) {
+            LOG_ERR("Failed to write to file");
+            exit(1);
         }
-        return NULL;
+        if (glfs_close(glfd) != 0) {
+            LOG_ERR("Failed to close file");
+            exit(1);
+        }
+    }
+    return NULL;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        pthread_t  tid[5] = {0};
-        char       buf[1025] = {0};
-        char       cmp_buf[1025] = {0};
-        int         ret      = 0;
-        char       *hostname = NULL;
-        char       *volname  = NULL;
-        char       *logfile  = NULL;
-        glfs_t     *fs       = NULL;
-        glfs_fd_t  *glfd     = NULL;
-        ssize_t     bytes_read = 0;
-        ssize_t     total_bytes_read = 0;
-        int i = 0;
-
-        if (argc != 4) {
-                fprintf (stderr, "Invalid argument\n");
-                exit(1);
-        }
-
-        hostname = argv[1];
-        volname = argv[2];
-        logfile = argv[3];
-
-        fs = init_glfs (hostname, volname, logfile);
-        if (fs == NULL) {
-                LOG_ERR ("init_glfs failed");
-                return -1;
-        }
-
-        for (i = 0; i < 5; i++) {
-                pthread_create(&tid[i], NULL, write_data, fs);
-        }
-
-        for (i = 0; i < 5; i++) {
-                pthread_join(tid[i], NULL);
-        }
-        glfd = glfs_open(fs, "parallel-write.txt", O_RDONLY);
-        if (!glfd) {
-                LOG_ERR ("Failed to open file for reading");
-                exit(1);
+    pthread_t tid[5] = {0};
+    char buf[1025] = {0};
+    char cmp_buf[1025] = {0};
+    int ret = 0;
+    char *hostname = NULL;
+    char *volname = NULL;
+    char *logfile = NULL;
+    glfs_t *fs = NULL;
+    glfs_fd_t *glfd = NULL;
+    ssize_t bytes_read = 0;
+    ssize_t total_bytes_read = 0;
+    int i = 0;
+
+    if (argc != 4) {
+        fprintf(stderr, "Invalid argument\n");
+        exit(1);
+    }
+
+    hostname = argv[1];
+    volname = argv[2];
+    logfile = argv[3];
+
+    fs = init_glfs(hostname, volname, logfile);
+    if (fs == NULL) {
+        LOG_ERR("init_glfs failed");
+        return -1;
+    }
+
+    for (i = 0; i < 5; i++) {
+        pthread_create(&tid[i], NULL, write_data, fs);
+    }
+
+    for (i = 0; i < 5; i++) {
+        pthread_join(tid[i], NULL);
+    }
+    glfd = glfs_open(fs, "parallel-write.txt", O_RDONLY);
+    if (!glfd) {
+        LOG_ERR("Failed to open file for reading");
+        exit(1);
+    }
+
+    while ((bytes_read = glfs_read(glfd, buf, sizeof(buf), 0)) > 0) {
+        if (bytes_read != sizeof(buf)) {
+            fprintf(stderr,
+                    "Didn't read complete data read: %zd "
+                    "expected: %lu",
+                    bytes_read, sizeof(buf));
+            exit(1);
         }
 
-        while ((bytes_read = glfs_read (glfd, buf, sizeof(buf), 0)) > 0) {
-                if (bytes_read != sizeof(buf)) {
-                        fprintf (stderr, "Didn't read complete data read: %zd "
-                                 "expected: %lu", bytes_read, sizeof(buf));
-                        exit(1);
-                }
-
-                total_bytes_read += bytes_read;
-                if (buf[0] < '1' || buf[0] >= thread_data) {
-                        fprintf(stderr, "Invalid character found: %c", buf[0]);
-                        exit(1);
-                }
-                memset(cmp_buf, buf[0], sizeof(cmp_buf));
-                if (memcmp(cmp_buf, buf, sizeof(cmp_buf))) {
-                        LOG_ERR ("Data corrupted");
-                        exit(1);
-                }
-                memset(cmp_buf, 0, sizeof(cmp_buf));
+        total_bytes_read += bytes_read;
+        if (buf[0] < '1' || buf[0] >= thread_data) {
+            fprintf(stderr, "Invalid character found: %c", buf[0]);
+            exit(1);
         }
-
-        if (total_bytes_read != 5*1025*1025) {
-                fprintf(stderr, "Failed to read what is written, read; %zd, "
-                        "expected %zu", total_bytes_read, 5*1025*1025);
-                exit(1);
-        }
-
-        if (glfs_close(glfd) != 0) {
-                LOG_ERR ("Failed to close");
-                exit(1);
+        memset(cmp_buf, buf[0], sizeof(cmp_buf));
+        if (memcmp(cmp_buf, buf, sizeof(cmp_buf))) {
+            LOG_ERR("Data corrupted");
+            exit(1);
         }
-        return 0;
+        memset(cmp_buf, 0, sizeof(cmp_buf));
+    }
+
+    if (total_bytes_read != 5 * 1025 * 1025) {
+        fprintf(stderr,
+                "Failed to read what is written, read; %zd, "
+                "expected %zu",
+                total_bytes_read, 5 * 1025 * 1025);
+        exit(1);
+    }
+
+    if (glfs_close(glfd) != 0) {
+        LOG_ERR("Failed to close");
+        exit(1);
+    }
+    return 0;
 }
diff --git a/tests/bugs/shard/shard-fallocate.c b/tests/bugs/shard/shard-fallocate.c
index 8745c0ece1d..3a784d3c02c 100644
--- a/tests/bugs/shard/shard-fallocate.c
+++ b/tests/bugs/shard/shard-fallocate.c
@@ -6,104 +6,107 @@
 #include <glusterfs/api/glfs-handles.h>
 
 enum fallocate_flag {
-        TEST_FALLOCATE_NONE,
-        TEST_FALLOCATE_KEEP_SIZE,
-        TEST_FALLOCATE_ZERO_RANGE,
-        TEST_FALLOCATE_PUNCH_HOLE,
-        TEST_FALLOCATE_MAX,
+    TEST_FALLOCATE_NONE,
+    TEST_FALLOCATE_KEEP_SIZE,
+    TEST_FALLOCATE_ZERO_RANGE,
+    TEST_FALLOCATE_PUNCH_HOLE,
+    TEST_FALLOCATE_MAX,
 };
 
 int
-get_fallocate_flag (int opcode)
+get_fallocate_flag(int opcode)
 {
-        int ret = 0;
+    int ret = 0;
 
-        switch (opcode) {
+    switch (opcode) {
         case TEST_FALLOCATE_NONE:
-                ret = 0;
-                break;
+            ret = 0;
+            break;
         case TEST_FALLOCATE_KEEP_SIZE:
-                ret = FALLOC_FL_KEEP_SIZE;
-                break;
+            ret = FALLOC_FL_KEEP_SIZE;
+            break;
         case TEST_FALLOCATE_ZERO_RANGE:
-                ret = FALLOC_FL_ZERO_RANGE;
-                break;
+            ret = FALLOC_FL_ZERO_RANGE;
+            break;
         case TEST_FALLOCATE_PUNCH_HOLE:
-                ret = FALLOC_FL_PUNCH_HOLE;
-                break;
+            ret = FALLOC_FL_PUNCH_HOLE;
+            break;
         default:
-                ret = -1;
-                break;
-        }
-        return ret;
+            ret = -1;
+            break;
+    }
+    return ret;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        int        ret = 1;
-        int        opcode = -1;
-        off_t      offset = 0;
-        size_t     len = 0;
-        glfs_t    *fs = NULL;
-        glfs_fd_t *fd = NULL;
+    int ret = 1;
+    int opcode = -1;
+    off_t offset = 0;
+    size_t len = 0;
+    glfs_t *fs = NULL;
+    glfs_fd_t *fd = NULL;
 
-        if (argc != 8) {
-                fprintf (stderr, "Syntax: %s <host> <volname> <opcode> <offset> <len> <file-path> <log-file>\n", argv[0]);
-                return 1;
-        }
+    if (argc != 8) {
+        fprintf(stderr,
+                "Syntax: %s <host> <volname> <opcode> <offset> <len> "
+                "<file-path> <log-file>\n",
+                argv[0]);
+        return 1;
+    }
 
-        fs = glfs_new (argv[2]);
-        if (!fs) {
-                fprintf (stderr, "glfs_new: returned NULL\n");
-                return 1;
-        }
+    fs = glfs_new(argv[2]);
+    if (!fs) {
+        fprintf(stderr, "glfs_new: returned NULL\n");
+        return 1;
+    }
 
-        ret = glfs_set_volfile_server (fs, "tcp", argv[1], 24007);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_volfile_server: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_set_volfile_server(fs, "tcp", argv[1], 24007);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_volfile_server: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = glfs_set_logging (fs, argv[7], 7);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_set_logging: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_set_logging(fs, argv[7], 7);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_set_logging: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = glfs_init (fs);
-        if (ret != 0) {
-                fprintf (stderr, "glfs_init: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_init(fs);
+    if (ret != 0) {
+        fprintf(stderr, "glfs_init: returned %d\n", ret);
+        goto out;
+    }
 
-        opcode = atoi (argv[3]);
-        opcode = get_fallocate_flag (opcode);
-        if (opcode < 0) {
-                fprintf (stderr, "get_fallocate_flag: invalid flag \n");
-                goto out;
-        }
+    opcode = atoi(argv[3]);
+    opcode = get_fallocate_flag(opcode);
+    if (opcode < 0) {
+        fprintf(stderr, "get_fallocate_flag: invalid flag \n");
+        goto out;
+    }
 
-        offset = atoi (argv[4]);
-        len    = atoi (argv[5]);
+    offset = atoi(argv[4]);
+    len = atoi(argv[5]);
 
-        fd = glfs_open (fs, argv[6], O_RDWR);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_open: returned NULL\n");
-                goto out;
-        }
+    fd = glfs_open(fs, argv[6], O_RDWR);
+    if (fd == NULL) {
+        fprintf(stderr, "glfs_open: returned NULL\n");
+        goto out;
+    }
 
-        ret = glfs_fallocate (fd, opcode, offset, len);
-        if (ret <= 0) {
-                fprintf (stderr, "glfs_fallocate: returned %d\n", ret);
-                goto out;
-        }
+    ret = glfs_fallocate(fd, opcode, offset, len);
+    if (ret <= 0) {
+        fprintf(stderr, "glfs_fallocate: returned %d\n", ret);
+        goto out;
+    }
 
-        ret = 0;
+    ret = 0;
 
 out:
-        if (fd)
-                glfs_close(fd);
-        glfs_fini (fs);
-        return ret;
+    if (fd)
+        glfs_close(fd);
+    glfs_fini(fs);
+    return ret;
 }