Land part 2 of clang-format changes

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

2 files changed, 81 insertions, 83 deletions

diff --git a/tests/bugs/access-control/bug-1051896.c b/tests/bugs/access-control/bug-1051896.c
index 27aa1559453..31799d97a71 100644
--- a/tests/bugs/access-control/bug-1051896.c
+++ b/tests/bugs/access-control/bug-1051896.c
@@ -13,85 +13,82 @@
 #include <utime.h>
 #include <sys/acl.h>
 
-int do_setfacl(const char *path, const char *options, const char *textacl)
+int
+do_setfacl(const char *path, const char *options, const char *textacl)
 {
-	int r;
-	int type;
-	acl_t acl;
-	int dob;
-	int dok;
-	int dom;
-	struct stat st;
-	char textmode[30];
+    int r;
+    int type;
+    acl_t acl;
+    int dob;
+    int dok;
+    int dom;
+    struct stat st;
+    char textmode[30];
 
-	r = 0;
-	dob = strchr(options, 'b') != (char *)NULL;
-	dok = strchr(options, 'k') != (char *)NULL;
-	dom = strchr(options, 'm') != (char *)NULL;
-	if ((dom && !textacl)
-	    || (!dom && (textacl || (!dok && !dob) ||
-                                    strchr(options, 'd')))) {
-		errno = EBADRQC; /* "bad request" */
-		r = -1;
-	} else {
-		if (dob || dok) {
-			r = acl_delete_def_file(path);
-		}
-		if (dob && !r) {
-			if (!stat(path, &st)) {
-				sprintf(textmode,
-                                        "u::%c%c%c,g::%c%c%c,o::%c%c%c",
-					(st.st_mode & 0400 ? 'r' : '-'),
-					(st.st_mode & 0200 ? 'w' : '-'),
-					(st.st_mode & 0100 ? 'x' : '-'),
-					(st.st_mode & 0040 ? 'r' : '-'),
-					(st.st_mode & 0020 ? 'w' : '-'),
-					(st.st_mode & 0010 ? 'x' : '-'),
-					(st.st_mode & 004 ? 'r' : '-'),
-					(st.st_mode & 002 ? 'w' : '-'),
-					(st.st_mode & 001 ? 'x' : '-'));
-				acl = acl_from_text(textmode);
-				if (acl) {
-					r = acl_set_file(path,
-                                                         ACL_TYPE_ACCESS, acl);
-					acl_free(acl);
-				} else
-					r = -1;
-			} else
-				r = -1;
-		}
-		if (!r && dom) {
-			if (strchr(options, 'd'))
-				type = ACL_TYPE_DEFAULT;
-			else
-				type = ACL_TYPE_ACCESS;
-			acl = acl_from_text(textacl);
-			if (acl) {
-				r = acl_set_file(path, type, acl);
-				acl_free(acl);
-			} else
-				r = -1;
-		}
-	}
-	if (r)
-		r = -errno;
-	return r;
+    r = 0;
+    dob = strchr(options, 'b') != (char *)NULL;
+    dok = strchr(options, 'k') != (char *)NULL;
+    dom = strchr(options, 'm') != (char *)NULL;
+    if ((dom && !textacl) ||
+        (!dom && (textacl || (!dok && !dob) || strchr(options, 'd')))) {
+        errno = EBADRQC; /* "bad request" */
+        r = -1;
+    } else {
+        if (dob || dok) {
+            r = acl_delete_def_file(path);
+        }
+        if (dob && !r) {
+            if (!stat(path, &st)) {
+                sprintf(textmode, "u::%c%c%c,g::%c%c%c,o::%c%c%c",
+                        (st.st_mode & 0400 ? 'r' : '-'),
+                        (st.st_mode & 0200 ? 'w' : '-'),
+                        (st.st_mode & 0100 ? 'x' : '-'),
+                        (st.st_mode & 0040 ? 'r' : '-'),
+                        (st.st_mode & 0020 ? 'w' : '-'),
+                        (st.st_mode & 0010 ? 'x' : '-'),
+                        (st.st_mode & 004 ? 'r' : '-'),
+                        (st.st_mode & 002 ? 'w' : '-'),
+                        (st.st_mode & 001 ? 'x' : '-'));
+                acl = acl_from_text(textmode);
+                if (acl) {
+                    r = acl_set_file(path, ACL_TYPE_ACCESS, acl);
+                    acl_free(acl);
+                } else
+                    r = -1;
+            } else
+                r = -1;
+        }
+        if (!r && dom) {
+            if (strchr(options, 'd'))
+                type = ACL_TYPE_DEFAULT;
+            else
+                type = ACL_TYPE_ACCESS;
+            acl = acl_from_text(textacl);
+            if (acl) {
+                r = acl_set_file(path, type, acl);
+                acl_free(acl);
+            } else
+                r = -1;
+        }
+    }
+    if (r)
+        r = -errno;
+    return r;
 }
 
-
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-	int rc = 0;
+    int rc = 0;
 
-	if (argc != 4) {
-		fprintf(stderr,
-                        "usage: ./setfacl_test <path> <options> <textacl>\n");
-		return 0;
-	}
-	rc = do_setfacl(argv[1], argv[2], argv[3]);
-	if (rc != 0) {
-		fprintf(stderr, "do_setfacl failed: %s\n", strerror(errno));
-		return rc;
-	}
-	return 0;
+    if (argc != 4) {
+        fprintf(stderr, "usage: ./setfacl_test <path> <options> <textacl>\n");
+        return 0;
+    }
+    rc = do_setfacl(argv[1], argv[2], argv[3]);
+    if (rc != 0) {
+        fprintf(stderr, "do_setfacl failed: %s\n", strerror(errno));
+        return rc;
+    }
+    return 0;
 }
diff --git a/tests/bugs/access-control/bug-1387241.c b/tests/bugs/access-control/bug-1387241.c
index 04e0d6ea11f..e2e843a2fda 100644
--- a/tests/bugs/access-control/bug-1387241.c
+++ b/tests/bugs/access-control/bug-1387241.c
@@ -3,15 +3,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-        int ret = EXIT_FAILURE;
-        int fd = open(argv[1], O_RDONLY|O_TRUNC);
+    int ret = EXIT_FAILURE;
+    int fd = open(argv[1], O_RDONLY | O_TRUNC);
 
-        if (fd) {
-                ret = EXIT_SUCCESS;
-                close(fd);
-        }
+    if (fd) {
+        ret = EXIT_SUCCESS;
+        close(fd);
+    }
 
-        return ret;
+    return ret;
 }