Merge pull request #2149 from RincewindsHat/clang-format

Clang format

1 files changed, 23 insertions, 11 deletions

diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 984183d3..99da5596 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -47,16 +47,18 @@ void my_free(int *argc, char **newargv, char **argv) {
                 printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
-                        if (newargv[i] == argv[1])
+                        if (newargv[i] == argv[1]) {
                                 freeflag = 0;
-                        else
+                        } else {
                                 free(newargv[i]);
+                        }
                 }
         }
         printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv)
+        if (newargv != argv) {
                 free(newargv);
+        }
         *argc = 0;
 }
 #endif
@@ -69,8 +71,9 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
                 return 0;
         }
         for (i = 0; i <= i1; i++) {
-                if (a1[i] == NULL && a2[i] == NULL)
+                if (a1[i] == NULL && a2[i] == NULL) {
                         continue;
+                }
                 if (a1[i] == NULL || a2[i] == NULL) {
                         printf("    Argument # %i null in one array!\n", i);
                         return 0;
@@ -110,27 +113,36 @@ int main(int argc, char **argv) {
         {
                 char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *)NULL};
                 argc_test = 2;
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *)NULL};
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank",
+                                                          (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *)NULL};
+                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts",
+                                                         "sect2@./config-opts.ini", (char *)NULL};
                 argc_test = 4;
-                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *)NULL};
+                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that",
+                                                          (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini",
-                                                         "--arg2",    (char *)NULL};
+                char *argv_test[] = {"prog_name",
+                                                         "--arg1=val1",
+                                                         "--extra-opts=@./config-opts.ini",
+                                                         "--extra-opts",
+                                                         "sect1@./config-opts.ini",
+                                                         "--arg2",
+                                                         (char *)NULL};
                 argc_test = 6;
-                char *argv_known[] = {"prog_name",   "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two",
-                                                          "--arg1=val1", "--arg2",    (char *)NULL};
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!",
+                                                          "--blank",   "--one=two", "--arg1=val1",
+                                                          "--arg2",    (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
                 my_free(&argc_test, argv_new, argv_test);