ENGO150/WHY2
Template
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

replaced all exit calls by returning noOutput

Browse Source
This commit is contained in:
Václav Šmejkal 2022-06-12 16:28:16 +02:00
parent c7902f5c83
commit f9bdbb1053
No known key found for this signature in database
GPG Key ID: FD749A97DF2D5E19
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/misc.c
View File

@ -98,7 +98,7 @@ void checkVersion(inputFlags flags)
if (notFoundBuffer == NOT_FOUND_TRIES) if (notFoundBuffer == NOT_FOUND_TRIES)
{ {
if (!flags.noOutput) fprintf(stderr, "%s'%s' not found! Exiting...\n", CLEAR_SCREEN, VERSIONS_NAME); if (!flags.noOutput) fprintf(stderr, "%s'%s' not found! Exiting...\n", CLEAR_SCREEN, VERSIONS_NAME);
exit(DOWNLOAD_FAILED); return noOutput(DOWNLOAD_FAILED);
} }
if (!flags.noOutput) printf("%s'%s' not found (%dx)! Trying again in a second.\n", CLEAR_SCREEN, VERSIONS_NAME, notFoundBuffer); if (!flags.noOutput) printf("%s'%s' not found (%dx)! Trying again in a second.\n", CLEAR_SCREEN, VERSIONS_NAME, notFoundBuffer);
@ -151,7 +151,7 @@ void checkVersion(inputFlags flags)
if (getuid() != 0) if (getuid() != 0)
{ {
if (!flags.noOutput) fprintf(stderr, "You need to be root to update!\t[I DO NOT RECOMMEND USING THIS]\n"); if (!flags.noOutput) fprintf(stderr, "You need to be root to update!\t[I DO NOT RECOMMEND USING THIS]\n");
exit(UPDATE_FAILED); return noOutput(UPDATE_FAILED);
} }
//VARIABLES //VARIABLES
@ -179,7 +179,7 @@ void checkVersion(inputFlags flags)
if (exitCode != 0) if (exitCode != 0)
{ {
if (!flags.noOutput) fprintf(stderr, "Updating failed! (cloning)\n"); if (!flags.noOutput) fprintf(stderr, "Updating failed! (cloning)\n");
exit(UPDATE_FAILED); return noOutput(UPDATE_FAILED);
} }
//COUNT installCommand LENGTH & ALLOCATE IT //COUNT installCommand LENGTH & ALLOCATE IT
@ -194,7 +194,7 @@ void checkVersion(inputFlags flags)
if (installCode != 0) if (installCode != 0)
{ {
if (!flags.noOutput) fprintf(stderr, "Updating failed! (installing)\n"); if (!flags.noOutput) fprintf(stderr, "Updating failed! (installing)\n");
exit(UPDATE_FAILED); return noOutput(UPDATE_FAILED);
} }
goto deallocation; //GREAT SUCCESS! goto deallocation; //GREAT SUCCESS!
@ -290,7 +290,7 @@ void checkKey(char *key, inputFlags flags)
if (strlen(key) < getKeyLength()) if (strlen(key) < getKeyLength())
{ {
if (!flags.noOutput) fprintf(stderr, "Key must be at least %lu characters long!\n", getKeyLength()); if (!flags.noOutput) fprintf(stderr, "Key must be at least %lu characters long!\n", getKeyLength());
exit(INVALID_KEY); return noOutput(INVALID_KEY);
} }
} }
@ -299,7 +299,7 @@ void checkText(char *text, inputFlags flags)
if (strcmp(text, "") == 0) if (strcmp(text, "") == 0)
{ {
if (!flags.noOutput) fprintf(stderr, "No text to encrypt!\n"); if (!flags.noOutput) fprintf(stderr, "No text to encrypt!\n");
exit(1); return noOutput(INVALID_TEXT);
} }
} }