Fix returns

penguin-teal · Nov 10, 2023 · 97ef69f · 97ef69f
1 parent ec6945c
commit 97ef69f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/hash.c b/src/hash.c
@@ -124,12 +124,11 @@ bool doHashes(struct AppArgs *appArgs, FILE *outF)
 
     if(!hashSize)
     {
-        if(inVal) free(inVal);
-
         fprintf(stderr, "Hashing failed. (got hashSize was zero)\n");
-        return 1;
+        return false;
     }
 
-    printOut(hash, outF, &appArgs);
+    printOut(hash, outF, appArgs);
 
+    return true;
 }
diff --git a/src/main.c b/src/main.c
@@ -10,10 +10,13 @@
 int main(int argc, char **argv)
 {
     char *inVal = NULL;
+    int code;
+    bool success;
     struct AppArgs appArgs;
+
     if(!doArgp(&appArgs, argc, argv)) return 2;
 
-    int code = getInput(&appArgs, &inVal);
+    code = getInput(&appArgs, &inVal);
     if(code) return code;
 
     if(appArgs.escape)
@@ -54,9 +57,12 @@ int main(int argc, char **argv)
         return 2;
     }
 
-    doHashes(&appArgs, outF);
+    success = doHashes(&appArgs, outF);
 
+    if(inVal) free(inVal);
     fclose(outF);
 
+    if(!success) return 2;
+
     return 0;
 }