From cfdfd2aa2cf94841f6c5b56a5343e8f31ead2c47 Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Fri, 22 Jul 2022 18:22:42 +0200 Subject: [PATCH] replaced UC with _Bool --- include/flags.h | 10 +++++----- include/misc.h | 6 +++--- src/lib/flags.c | 2 +- src/lib/misc.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/flags.h b/include/flags.h index f907f1e..812532e 100644 --- a/include/flags.h +++ b/include/flags.h @@ -29,9 +29,9 @@ typedef struct { - unsigned char noCheck; //BOOLEAN FOR SKIPPING VERSION CHECK - unsigned char noOutput; //BOOLEAN FOR NOT PRINTING OUTPUT WHEN ENCRYPTING/DECRYPTING - unsigned char update; //BOOLEAN FOR UPDATING YOUR WHY VERSION IF OLD IS USED + _Bool noCheck; //BOOLEAN FOR SKIPPING VERSION CHECK + _Bool noOutput; //BOOLEAN FOR NOT PRINTING OUTPUT WHEN ENCRYPTING/DECRYPTING + _Bool update; //BOOLEAN FOR UPDATING YOUR WHY VERSION IF OLD IS USED } inputFlags; typedef struct @@ -40,7 +40,7 @@ typedef struct char *usedKey; //VARIABLE FOR USED/GENERATED KEY unsigned long unusedKeySize; //VARIABLE FOR COUNT OF UNUSED CHARACTERS IN KEY unsigned long elapsedTime; //VARIABLE FOR ELAPSED TIME IN MICROSECONDS => 1s = 1000000µs - unsigned char exitCode; //VARIABLE FOR EXIT CODE + _Bool exitCode; //VARIABLE FOR EXIT CODE } outputFlags; //NOTE: Variables were moved to 'flags.c' to force y'all using getters @@ -50,7 +50,7 @@ char getEncryptionSeparator(); unsigned long getKeyLength(); inputFlags defaultFlags(); //THIS GENERATES inputFlags WITH DEFAULT VALUES inputFlags getFlags(); //RETURNS USED FLAGS -outputFlags noOutput(unsigned char exitCode); //SAME AS defaultFlags() BUT FOR outputFlags +outputFlags noOutput(_Bool exitCode); //SAME AS defaultFlags() BUT FOR outputFlags //SETTERS void setEncryptionSeparator(char encryptionSeparatorNew); diff --git a/include/misc.h b/include/misc.h index a115e1c..780afde 100644 --- a/include/misc.h +++ b/include/misc.h @@ -7,9 +7,9 @@ void generateTextKeyChain(char *key, int *textKeyChain, int textKeyChainSize); //GENERATES ARRAY FOR ENCRYPTION/DECRYPTION void deallocateOutput(outputFlags flags); //DEALLOCATES flags -unsigned char checkVersion(); //THIS FUNCTION CHECKS IF LATEST VERSION OF WHY2 IS USED -unsigned char checkKey(char *key); //CHECKS IF KEY IS VALID -unsigned char checkText(char *text); //CHECKS IF TEXT IS VALID +_Bool checkVersion(); //THIS FUNCTION CHECKS IF LATEST VERSION OF WHY2 IS USED +_Bool checkKey(char *key); //CHECKS IF KEY IS VALID +_Bool checkText(char *text); //CHECKS IF TEXT IS VALID unsigned long countIntLength(int number); //RETURNS LENGTH OF number unsigned long countUnusedKeySize(char *text, char *key); //COUNT unusedKeySize unsigned long compareTimeMicro(struct timeval startTime, struct timeval finishTime); //COMPARE TIMES IN MICROSECONDS diff --git a/src/lib/flags.c b/src/lib/flags.c index 21ac613..df42e0a 100644 --- a/src/lib/flags.c +++ b/src/lib/flags.c @@ -31,7 +31,7 @@ inputFlags getFlags() return flags; } -outputFlags noOutput(unsigned char exitCode) +outputFlags noOutput(_Bool exitCode) { char *emptyText = malloc(1); //TEXT emptyText[0] = '\0'; diff --git a/src/lib/misc.c b/src/lib/misc.c index 4266b17..d76c11e 100644 --- a/src/lib/misc.c +++ b/src/lib/misc.c @@ -72,7 +72,7 @@ char *replaceWord(char *string, char *old, char *new) //CODE FROM: https://www.g return result; } -unsigned char checkVersion() +_Bool checkVersion() { if (getFlags().noCheck) return SUCCESS; @@ -301,7 +301,7 @@ void deallocateOutput(outputFlags flags) free(flags.usedKey); } -unsigned char checkKey(char *key) +_Bool checkKey(char *key) { if (strlen(key) < getKeyLength()) { @@ -312,7 +312,7 @@ unsigned char checkKey(char *key) return SUCCESS; } -unsigned char checkText(char *text) +_Bool checkText(char *text) { if (strcmp(text, "") == 0) {