code cleanups, fixing warnings

Author: bertschinger

src/gufi_dir2index.c

@@ -189,8 +189,6 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     nda.topath     = NULL;
     nda.ed.type    = 'd';
 
-    DIR *dir = NULL;
-
     decompress_work(&nda.work, data);
 
     const int process_dbdb = ((pa->in.min_level <= nda.work->level) &&
@@ -210,7 +208,6 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
         rc = 1;
         goto cleanup;
     }
-    dir = dir_rc->dir;
 
     /* offset by work->root_len to remove prefix */
     nda.topath_len = nda.in->nameto.len + 1 + nda.work->name_len - nda.work->root_parent.len;
@@ -235,7 +232,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
         if (err != EEXIST) {
             fprintf(stderr, "mkdir %s failure: %d %s\n", nda.topath, err, strerror(err));
             rc = 1;
-            goto cleanup;
+            goto cleanup_dir;
         }
     }
 
@@ -250,7 +247,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
 
         if (!nda.db) {
             rc = 1;
-            goto cleanup;
+            goto cleanup_dir;
         }
 
         /* prepare to insert into the database */
@@ -315,9 +312,10 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     chmod(nda.topath, nda.ed.statuso.st_mode);
     chown(nda.topath, nda.ed.statuso.st_uid, nda.ed.statuso.st_gid);
 
-  cleanup:
+  cleanup_dir:
     dir_dec(dir_rc);
 
+  cleanup:
     if (process_dbdb) {
         pa->total_dirs[id]++;
         pa->total_nondirs[id] += ctrs.nondirs_processed;

src/gufi_dir2trace.c

@@ -141,7 +141,6 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
         rc = 1;
         goto cleanup;
     }
-    DIR *dir = dir_rc->dir;
 
     memset(&ed, 0, sizeof(ed));
     if (lstat(work->name, &ed.statuso) != 0) {

src/gufi_index2dir.c

@@ -271,7 +271,6 @@ static int processdir(struct QPTPool * ctx, const size_t id, void * data, void *
         rc = 1;
         goto cleanup;
     }
-    DIR *dir = dir_rc->dir;
 
     // get source directory info
     struct stat dir_st;

src/gufi_treesummary.c

@@ -138,7 +138,6 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     if (!dir_rc) {
         goto out_free;
     }
-    DIR *dir = dir_rc->dir;
 
     if (pa->in.printdir) {
         ed.type = 'd';

src/parallel_cpr.c

@@ -235,7 +235,6 @@ static int cpr_dir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     if (!dir_rc) {
         print_error_and_goto("Could not open_directory", work->name, cleanup);
     }
-    DIR *dir = dir_rc->dir;
 
     struct stat st;
     if (lstat(work->name, &st) != 0) {

test/unit/googletest/descend.cpp.in

@@ -182,7 +182,7 @@ TEST(descend, builddir) {
     QPTPool_destroy(pool);
 
     EXPECT_EQ(closedir(dir),    0);
-    free(work);
+    free_work(work);
     EXPECT_EQ(unlink(pipename), 0);
     EXPECT_EQ(unlink(linkname), 0);
 }
@@ -273,7 +273,7 @@ TEST(descend, swap) {
     QPTPool_destroy(pool);
 
     EXPECT_EQ(closedir(dir), 0);
-    free(work);
+    free_work(work);
 
     EXPECT_EQ(remove(root), 0);
 }