balh:

Author: ragusaa

sigtool/sigtool.c

@@ -709,7 +709,8 @@ static int qcompare(const void *a, const void *b)
 }
 
 char *createTempDir(const struct optstruct *opts);
-void removeTempDir(const struct optstruct *opts, char * dir){
+void removeTempDir(const struct optstruct *opts, char *dir)
+{
     if (!optget(opts, "leave-temps")->enabled) {
         cli_rmdirs(dir);
     }
@@ -1104,7 +1105,7 @@ static int build(const struct optstruct *opts)
 
     if (CL_SUCCESS != cl_cvdunpack(olddb, pt, true)) {
         mprintf(LOGG_ERROR, "build: Can't unpack CVD file %s\n", olddb);
-            removeTempDir(opts, pt);
+        removeTempDir(opts, pt);
         free(pt);
         unlink(newcvd);
         return -1;
@@ -1128,7 +1129,7 @@ static int build(const struct optstruct *opts)
 
     snprintf(patch, sizeof(patch), "%s-%u.script", dbname, version);
     ret = diffdirs(olddb, pt, patch);
-        removeTempDir(opts, pt);
+    removeTempDir(opts, pt);
     free(pt);
 
     if (ret == -1) {
@@ -1730,7 +1731,7 @@ static int vbadump(const struct optstruct *opts)
     }
     scanfile(filename, engine, opts, &options);
 
-            removeTempDir(opts, engine->tmpdir);
+    removeTempDir(opts, engine->tmpdir);
 
     ret = 0;
 done:
@@ -2116,21 +2117,21 @@ static int verifydiff(const struct optstruct *opts, const char *diff, const char
 
     if (!getcwd(cwd, sizeof(cwd))) {
         mprintf(LOGG_ERROR, "verifydiff: getcwd() failed\n");
-            removeTempDir(opts, tempdir);
+        removeTempDir(opts, tempdir);
         free(tempdir);
         return -1;
     }
 
     if ((fd = open(diff, O_RDONLY | O_BINARY)) == -1) {
         mprintf(LOGG_ERROR, "verifydiff: Can't open diff file %s\n", diff);
-            removeTempDir(opts, tempdir);
+        removeTempDir(opts, tempdir);
         free(tempdir);
         return -1;
     }
 
     if (chdir(tempdir) == -1) {
         mprintf(LOGG_ERROR, "verifydiff: Can't chdir to %s\n", tempdir);
-            removeTempDir(opts, tempdir);
+        removeTempDir(opts, tempdir);
         free(tempdir);
         close(fd);
         return -1;
@@ -2140,7 +2141,7 @@ static int verifydiff(const struct optstruct *opts, const char *diff, const char
         mprintf(LOGG_ERROR, "verifydiff: Can't apply %s\n", diff);
         if (chdir(cwd) == -1)
             mprintf(LOGG_WARNING, "verifydiff: Can't chdir to %s\n", cwd);
-            removeTempDir(opts, tempdir);
+        removeTempDir(opts, tempdir);
         free(tempdir);
         close(fd);
         return -1;
@@ -2151,7 +2152,7 @@ static int verifydiff(const struct optstruct *opts, const char *diff, const char
 
     if (chdir(cwd) == -1)
         mprintf(LOGG_WARNING, "verifydiff: Can't chdir to %s\n", cwd);
-            removeTempDir(opts, tempdir);
+    removeTempDir(opts, tempdir);
     free(tempdir);
 
     if (!ret) {
@@ -3335,8 +3336,8 @@ static int makediff(const struct optstruct *opts)
     snprintf(name, sizeof(name), "%s-%u.script", getdbname(opts->filename[0], dbname, sizeof(dbname)), newver);
     ret = diffdirs(odir, ndir, name);
 
-        removeTempDir(opts, odir);
-        removeTempDir(opts, ndir);
+    removeTempDir(opts, odir);
+    removeTempDir(opts, ndir);
     free(odir);
     free(ndir);