Fix warnings in make test code.

Jeremy.
(cherry picked from commit 675c4d836ec328320994bc1632a14ac5597bbdf8)

diff --git a/source/lib/replace/test/os2_delete.c b/source/lib/replace/test/os2_delete.c
index b45c135355a0a7be5f339e4225f1009ea2a0a943..44efeea08a5bdcde791d64bd222aef1a08fa6881 100644 (file)
--- a/source/lib/replace/test/os2_delete.c
+++ b/source/lib/replace/test/os2_delete.c
@@ -30,7 +30,9 @@ static int test_readdir_os2_delete_ret;
 static void cleanup(void)
 {
        /* I'm a lazy bastard */
-       system("rm -rf " TESTDIR);
+       if (system("rm -rf " TESTDIR)) {
+               FAILED("system");
+       }
        mkdir(TESTDIR, 0700) == 0 || FAILED("mkdir");
 }
 
@@ -118,7 +120,9 @@ int test_readdir_os2_delete(void)
 
        rmdir(TESTDIR) == 0 || FAILED("rmdir");
 
-       system("rm -rf " TESTDIR);
+       if (system("rm -rf " TESTDIR) == -1) {
+               FAILED("system");
+       }
 
        return test_readdir_os2_delete_ret;
 }

diff --git a/source/torture/nbio.c b/source/torture/nbio.c
index 81d0eb816b9fbdd415e21d930d7cd6facf6b1034..a010c80985e6d9ec3abe839c29a4c15a1242f135 100644 (file)
--- a/source/torture/nbio.c
+++ b/source/torture/nbio.c
@@ -111,7 +111,9 @@ static void sigsegv(int sig)
        printf("segv at line %d\n", line_count);
        slprintf(line, sizeof(line), "/usr/X11R6/bin/xterm -e gdb /proc/%d/exe %d", 
                (int)getpid(), (int)getpid());
-       system(line);
+       if (system(line) == -1) {
+               printf("system() failed\n");
+       }
        exit(1);
 }
 
@@ -280,10 +282,16 @@ static void delete_fn(const char *mnt, file_info *finfo, const char *name, void
 
        n = SMB_STRDUP(name);
        n[strlen(n)-1] = 0;
-       asprintf(&s, "%s%s", n, finfo->name);
+       if (asprintf(&s, "%s%s", n, finfo->name) == -1) {
+               printf("asprintf failed\n");
+               return;
+       }
        if (finfo->mode & aDIR) {
                char *s2;
-               asprintf(&s2, "%s\\*", s);
+               if (asprintf(&s2, "%s\\*", s) == -1) {
+                       printf("asprintf failed\n");
+                       return;
+               }
                cli_list(c, s2, aDIR, delete_fn, NULL);
                nb_rmdir(s);
        } else {
@@ -297,7 +305,10 @@ static void delete_fn(const char *mnt, file_info *finfo, const char *name, void
 void nb_deltree(const char *dname)
 {
        char *mask;
-       asprintf(&mask, "%s\\*", dname);
+       if (asprintf(&mask, "%s\\*", dname) == -1) {
+               printf("asprintf failed\n");
+               return;
+       }
 
        total_deleted = 0;
        cli_list(c, mask, aDIR, delete_fn, NULL);

diff --git a/source/torture/torture.c b/source/torture/torture.c
index ace8fef004abb8fd3ecfe4da9f1916a85908b2ac..bc09e6b06f1407b963a16fd1dd8b7df0551823f3 100644 (file)
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -1221,7 +1221,9 @@ static bool run_tcon2_test(int dummy)
 
        printf("starting tcon2 test\n");
 
-       asprintf(&service, "\\\\%s\\%s", host, share);
+       if (asprintf(&service, "\\\\%s\\%s", host, share) == -1) {
+               return false;
+       }
 
        status = cli_raw_tcon(cli, service, password, "?????", &max_xmit, &cnum);
 
@@ -5071,8 +5073,13 @@ static bool run_local_rbtree(int dummy)
        for (i=0; i<1000; i++) {
                char *key, *value;
 
-               asprintf(&key, "key%ld", random());
-               asprintf(&value, "value%ld", random());
+               if (asprintf(&key, "key%ld", random()) == -1) {
+                       goto done;
+               }
+               if (asprintf(&value, "value%ld", random()) == -1) {
+                       SAFE_FREE(key);
+                       goto done;
+               }
 
                if (!rbt_testval(db, key, value)) {
                        SAFE_FREE(key);
@@ -5081,7 +5088,10 @@ static bool run_local_rbtree(int dummy)
                }
 
                SAFE_FREE(value);
-               asprintf(&value, "value%ld", random());
+               if (asprintf(&value, "value%ld", random()) == -1) {
+                       SAFE_FREE(key);
+                       goto done;
+               }
 
                if (!rbt_testval(db, key, value)) {
                        SAFE_FREE(key);

diff --git a/source/torture/utable.c b/source/torture/utable.c
index 7032cea99b82aa1fe70eefbd95ebdb7a4e5c6f7b..e36b0388c4ed42a1c1b80ff30a5d6ed13006ea9a 100644 (file)
--- a/source/torture/utable.c
+++ b/source/torture/utable.c
@@ -84,7 +84,11 @@ bool torture_utable(int dummy)
                d_printf("Failed to create valid.dat - %s", strerror(errno));
                return False;
        }
-       write(fd, valid, 0x10000);
+       if (write(fd, valid, 0x10000) != 0x10000) {
+               d_printf("Failed to create valid.dat - %s", strerror(errno));
+               close(fd);
+               return false;
+       }
        close(fd);
        d_printf("wrote valid.dat\n");