Land part 2 of clang-format changes

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

1 files changed, 93 insertions, 98 deletions

diff --git a/tests/basic/ec/ec-fast-fgetxattr.c b/tests/basic/ec/ec-fast-fgetxattr.c
index b40dda65de5..bf982151861 100644
--- a/tests/basic/ec/ec-fast-fgetxattr.c
+++ b/tests/basic/ec/ec-fast-fgetxattr.c
@@ -12,123 +12,118 @@
 int cbk_complete = 0;
 ssize_t cbk_ret_val = 0;
 int
-fill_iov (struct iovec *iov, char fillchar, int count)
+fill_iov(struct iovec *iov, char fillchar, int count)
 {
-        int ret = -1;
-
-        iov->iov_base = malloc (count + 1);
-        if (iov->iov_base == NULL) {
-                return ret;
-        } else {
-                iov->iov_len = count;
-                ret = 0;
-        }
-        memset (iov->iov_base, fillchar, count);
-        memset (iov->iov_base + count, '\0', 1);
+    int ret = -1;
 
+    iov->iov_base = malloc(count + 1);
+    if (iov->iov_base == NULL) {
         return ret;
+    } else {
+        iov->iov_len = count;
+        ret = 0;
+    }
+    memset(iov->iov_base, fillchar, count);
+    memset(iov->iov_base + count, '\0', 1);
+
+    return ret;
 }
 
 void
-write_async_cbk (glfs_fd_t *fd, ssize_t ret, struct stat *prestat,
-                 struct stat *poststat, void *cookie)
+write_async_cbk(glfs_fd_t *fd, ssize_t ret, struct stat *prestat,
+                struct stat *poststat, void *cookie)
 {
-
-        if (ret < 0) {
-                fprintf (stderr, "glfs_write failed");
-        }
-        cbk_ret_val = ret;
-        cbk_complete = 1;
+    if (ret < 0) {
+        fprintf(stderr, "glfs_write failed");
+    }
+    cbk_ret_val = ret;
+    cbk_complete = 1;
 }
 
 int
-write_async (glfs_t *fs, glfs_fd_t *glfd, int char_count)
+write_async(glfs_t *fs, glfs_fd_t *glfd, int char_count)
 {
-        ssize_t         ret          = -1;
-        int             flags        = O_RDWR;
-        struct iovec    iov          = {0};
-
-
+    ssize_t ret = -1;
+    int flags = O_RDWR;
+    struct iovec iov = {0};
 
-        ret = fill_iov (&iov, 'a', char_count);
-        if (ret) {
-                fprintf (stderr, "failed to create iov");
-                goto out;
-        }
+    ret = fill_iov(&iov, 'a', char_count);
+    if (ret) {
+        fprintf(stderr, "failed to create iov");
+        goto out;
+    }
 
-        ret = glfs_pwritev_async (glfd, &iov, 1, 0, flags, write_async_cbk,
-                                  NULL);
+    ret = glfs_pwritev_async(glfd, &iov, 1, 0, flags, write_async_cbk, NULL);
 out:
-        if (ret < 0) {
-                fprintf (stderr, "glfs_pwritev async failed");
-        }
-        return ret;
-
+    if (ret < 0) {
+        fprintf(stderr, "glfs_pwritev async failed");
+    }
+    return ret;
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        glfs_t    *fs = NULL;
-        glfs_fd_t *fd = NULL;
-        int        ret = 1;
-        char       buf[1024] = {0};
-
-        if (argc != 4) {
-                fprintf (stderr, "Syntax: %s <host> <volname> <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, "/tmp/ec-fgetxattr.log", 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 | O_TRUNC);
-        if (fd == NULL) {
-                fprintf (stderr, "glfs_open: returned NULL\n");
-                goto out;
-        }
-
-        ret = write_async (fs, fd, 16);
-        if (ret) {
-                fprintf (stderr, "write_async failed\n");
-        }
-
-        sleep (1);
-        ret = glfs_fgetxattr (fd, "trusted.glusterfs.abc", buf, sizeof buf);
-        while (cbk_complete != 1) {
-                /* ret will be -ve as xattr doesn't exist, and fgetxattr should
-                 * return waaaayyy before writev */
-                ret = 0;
-                sleep (1);
-        }
-        if (cbk_ret_val < 0) {
-                fprintf (stderr, "cbk_ret_val is -ve\n");
-                ret = -1;
-        }
-        glfs_close(fd);
+    glfs_t *fs = NULL;
+    glfs_fd_t *fd = NULL;
+    int ret = 1;
+    char buf[1024] = {0};
+
+    if (argc != 4) {
+        fprintf(stderr, "Syntax: %s <host> <volname> <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, "/tmp/ec-fgetxattr.log", 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 | O_TRUNC);
+    if (fd == NULL) {
+        fprintf(stderr, "glfs_open: returned NULL\n");
+        goto out;
+    }
+
+    ret = write_async(fs, fd, 16);
+    if (ret) {
+        fprintf(stderr, "write_async failed\n");
+    }
+
+    sleep(1);
+    ret = glfs_fgetxattr(fd, "trusted.glusterfs.abc", buf, sizeof buf);
+    while (cbk_complete != 1) {
+        /* ret will be -ve as xattr doesn't exist, and fgetxattr should
+         * return waaaayyy before writev */
+        ret = 0;
+        sleep(1);
+    }
+    if (cbk_ret_val < 0) {
+        fprintf(stderr, "cbk_ret_val is -ve\n");
+        ret = -1;
+    }
+    glfs_close(fd);
 
 out:
-        unlink ("/tmp/ec-fgetxattr.log");
-        glfs_fini (fs);
+    unlink("/tmp/ec-fgetxattr.log");
+    glfs_fini(fs);
 
-        return ret;
+    return ret;
 }