Land part 2 of clang-format changes

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

1 files changed, 82 insertions, 83 deletions

diff --git a/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c
index 4f4fde94e4..b0c5d31ba0 100644
--- a/extras/geo-rep/gsync-sync-gfid.c
+++ b/extras/geo-rep/gsync-sync-gfid.c
@@ -15,96 +15,95 @@
 #endif
 
 #ifndef GF_FUSE_AUX_GFID_HEAL
-#define GF_FUSE_AUX_GFID_HEAL    "glusterfs.gfid.heal"
+#define GF_FUSE_AUX_GFID_HEAL "glusterfs.gfid.heal"
 #endif
 
-#define GLFS_LINE_MAX           (PATH_MAX + (2 * UUID_CANONICAL_FORM_LEN))
+#define GLFS_LINE_MAX (PATH_MAX + (2 * UUID_CANONICAL_FORM_LEN))
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-        char *file                = NULL;
-        char *tmp = NULL;
-        char *tmp1 = NULL;
-        char *parent_dir = NULL;
-        char *gfid                = NULL;
-        char *bname = NULL;
-        int   ret                 = -1;
-        int   len                 = 0;
-        FILE *fp                  = NULL;
-        char  line[GLFS_LINE_MAX] = {0,};
-        char *path = NULL;
-        void  *blob               = NULL;
-        void  *tmp_blob               = NULL;
-
-        if (argc != 2) {
-                /* each line in the file has the following format
-                 * uuid-in-canonical-form path-relative-to-gluster-mount.
-                 * Both uuid and relative path are from master mount.
-                 */
-                fprintf (stderr, "usage: %s <file-of-paths-to-be-synced>\n",
-                         argv[0]);
-                goto out;
+    char *file = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *parent_dir = NULL;
+    char *gfid = NULL;
+    char *bname = NULL;
+    int ret = -1;
+    int len = 0;
+    FILE *fp = NULL;
+    char line[GLFS_LINE_MAX] = {
+        0,
+    };
+    char *path = NULL;
+    void *blob = NULL;
+    void *tmp_blob = NULL;
+
+    if (argc != 2) {
+        /* each line in the file has the following format
+         * uuid-in-canonical-form path-relative-to-gluster-mount.
+         * Both uuid and relative path are from master mount.
+         */
+        fprintf(stderr, "usage: %s <file-of-paths-to-be-synced>\n", argv[0]);
+        goto out;
+    }
+
+    file = argv[1];
+
+    fp = fopen(file, "r");
+    if (fp == NULL) {
+        fprintf(stderr, "cannot open %s for reading (%s)\n", file,
+                strerror(errno));
+        goto out;
+    }
+
+    while (fgets(line, GLFS_LINE_MAX, fp) != NULL) {
+        tmp = line;
+        path = gfid = line;
+
+        path += UUID_CANONICAL_FORM_LEN + 1;
+
+        while (isspace(*path))
+            path++;
+
+        len = strlen(line);
+        if ((len < GLFS_LINE_MAX) && (line[len - 1] == '\n'))
+            line[len - 1] = '\0';
+
+        line[UUID_CANONICAL_FORM_LEN] = '\0';
+
+        tmp = strdup(path);
+        tmp1 = strdup(path);
+        parent_dir = dirname(tmp);
+        bname = basename(tmp1);
+
+        /* gfid + '\0' + bname + '\0' */
+        len = UUID_CANONICAL_FORM_LEN + 1 + strlen(bname) + 1;
+
+        blob = malloc(len);
+
+        memcpy(blob, gfid, UUID_CANONICAL_FORM_LEN);
+
+        tmp_blob = blob + UUID_CANONICAL_FORM_LEN + 1;
+
+        memcpy(tmp_blob, bname, strlen(bname));
+
+        ret = sys_lsetxattr(parent_dir, GF_FUSE_AUX_GFID_HEAL, blob, len, 0);
+        if (ret < 0) {
+            fprintf(stderr, "setxattr on %s/%s failed (%s)\n", parent_dir,
+                    bname, strerror(errno));
         }
+        memset(line, 0, GLFS_LINE_MAX);
 
-        file = argv[1];
+        free(blob);
+        free(tmp);
+        free(tmp1);
+        blob = NULL;
+    }
 
-        fp = fopen (file, "r");
-        if (fp == NULL) {
-                fprintf (stderr, "cannot open %s for reading (%s)\n",
-                         file, strerror (errno));
-                goto out;
-        }
-
-        while (fgets (line, GLFS_LINE_MAX, fp) != NULL) {
-                tmp = line;
-                path = gfid = line;
-
-                path += UUID_CANONICAL_FORM_LEN + 1;
-
-                while(isspace (*path))
-                        path++;
-
-                len = strlen (line);
-                if ((len < GLFS_LINE_MAX) &&
-                    (line[len - 1] == '\n'))
-                        line[len - 1] = '\0';
-
-                line[UUID_CANONICAL_FORM_LEN] = '\0';
-
-                tmp = strdup (path);
-                tmp1 = strdup (path);
-                parent_dir = dirname (tmp);
-                bname = basename (tmp1);
-
-                /* gfid + '\0' + bname + '\0' */
-                len = UUID_CANONICAL_FORM_LEN + 1 + strlen (bname) + 1;
-
-                blob = malloc (len);
-
-                memcpy (blob, gfid, UUID_CANONICAL_FORM_LEN);
-
-                tmp_blob = blob + UUID_CANONICAL_FORM_LEN + 1;
-
-                memcpy (tmp_blob, bname, strlen (bname));
-
-                ret = sys_lsetxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, 
-                                blob, len, 0);
-                if (ret < 0) {
-                        fprintf (stderr, "setxattr on %s/%s failed (%s)\n",
-                                 parent_dir, bname, strerror (errno));
-                }
-                memset (line, 0, GLFS_LINE_MAX);
-
-                free (blob);
-                free (tmp); free (tmp1);
-                blob = NULL;
-        }
-
-        ret = 0;
+    ret = 0;
 out:
-        if (fp)
-                fclose(fp);
-        return ret;
+    if (fp)
+        fclose(fp);
+    return ret;
 }
-