general refactorin in lib, more local variables, real booleans

5 files changed, 25 insertions, 31 deletions

diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index ade0da90..d51016cc 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -38,31 +38,29 @@ char *get_command(char *const *line) {
 }
 
 int main(int argc, char **argv) {
-        char **command_line = malloc(sizeof(char *) * COMMAND_LINE);
-        char *command = NULL;
-        char *perl;
-        output chld_out, chld_err;
-        int c;
-        int result = UNSET;
-
         plan_tests(51);
 
         diag("Running plain echo command, set one");
 
         /* ensure everything is empty before we begin */
+
+        output chld_out;
         memset(&chld_out, 0, sizeof(output));
+        output chld_err;
         memset(&chld_err, 0, sizeof(output));
         ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
         ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        int result = UNSET;
         ok(result == UNSET, "(initialised) Checking exit code is reset");
 
+        char **command_line = malloc(sizeof(char *) * COMMAND_LINE);
         command_line[0] = strdup("/bin/echo");
         command_line[1] = strdup("this");
         command_line[2] = strdup("is");
         command_line[3] = strdup("test");
         command_line[4] = strdup("one");
 
-        command = get_command(command_line);
+        char *command = get_command(command_line);
 
         result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         ok(chld_out.lines == 1, "(array) Check for expected number of stdout lines");
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 3792d142..de983764 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -50,11 +50,10 @@ char *list2str(np_arg_list *optlst) {
 }
 
 int main(int argc, char **argv) {
-        char *optstr = NULL;
 
         plan_tests(12);
 
-        optstr = list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
+        char *optstr = list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
         ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"),
            "config-tiny.ini's section as expected");
         my_free(optstr);
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 99da5596..fa95c4d4 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -40,15 +40,16 @@ void my_free(int *argc, char **newargv, char **argv) {
 #else
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag = 1;
+        bool freeflag = true;
         printf("    Arg(%i): ", *argc + 1);
         printf("'%s' ", newargv[0]);
-        for (i = 1; i < *argc; i++) {
+
+        for (int i = 1; i < *argc; i++) {
                 printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
                         if (newargv[i] == argv[1]) {
-                                freeflag = 0;
+                                freeflag = false;
                         } else {
                                 free(newargv[i]);
                         }
@@ -64,13 +65,12 @@ void my_free(int *argc, char **newargv, char **argv) {
 #endif
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i = 0; i <= i1; i++) {
+
+        for (int i = 0; i <= i1; i++) {
                 if (a1[i] == NULL && a2[i] == NULL) {
                         continue;
                 }
@@ -87,11 +87,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 }
 
 int main(int argc, char **argv) {
-        char **argv_new = NULL;
-        int i, argc_test;
-
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
                 char *argv_test[] = {"prog_name", (char *)NULL};
                 argc_test = 1;
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index d1b0aca3..3dd1b039 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -23,15 +23,16 @@
 
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag = 1;
+        bool freeflag = true;
+
         printf("    Arg(%i): ", *argc + 1);
         printf("'%s' ", newargv[0]);
-        for (i = 1; i < *argc; i++) {
+        for (int i = 1; i < *argc; i++) {
                 printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
                         if (newargv[i] == argv[1]) {
-                                freeflag = 0;
+                                freeflag = false;
                         } else {
                                 free(newargv[i]);
                         }
@@ -46,13 +47,12 @@ void my_free(int *argc, char **newargv, char **argv) {
 }
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i = 0; i <= i1; i++) {
+
+        for (int i = 0; i <= i1; i++) {
                 if (a1[i] == NULL && a2[i] == NULL) {
                         continue;
                 }
@@ -69,11 +69,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 }
 
 int main(int argc, char **argv) {
-        char **argv_new = NULL;
-        int i, argc_test;
-
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
                 char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *)NULL};
                 argc_test = 5;
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index de3a2102..37c818c9 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -21,11 +21,10 @@
 #include "tap.h"
 
 int main(void) {
-        char **server_expect;
-        int server_expect_count = 3;
-
         plan_tests(9);
 
+        char **server_expect;
+        const int server_expect_count = 3;
         server_expect = malloc(sizeof(char *) * server_expect_count);
 
         server_expect[0] = strdup("AA");