Refactor

CherryPill · Jun 3, 2023 · 4b26c3f · 4b26c3f
1 parent 959a5fc
commit 4b26c3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/consts/text_consts.h b/src/consts/text_consts.h
@@ -7,13 +7,13 @@
 
 #include <tchar.h>
 
-enum errorMsgResolver {
-    openFileError = 0,
+enum ErrorMsgResolver {
+    OpenFileError = 0,
     CryptAcquireCtxError,
     CryptCreateHashError,
     CryptHashDataError,
-    fileReadError,
-    clipboardError
+    FileReadError,
+    ClipboardError
 };
 
 static TCHAR* errorMessages[] = {

diff --git a/src/enc/hashing.c b/src/enc/hashing.c
@@ -41,7 +41,7 @@ void generateHash(TCHAR *filePath, char *hash) {
     GetFileSizeEx(hFile, &totalBytes);
 
     if (hFile == INVALID_HANDLE_VALUE) {
-        enum errorMsgResolver errorMsgIdx = openFileError;
+        enum ErrorMsgResolver errorMsgIdx = OpenFileError;
         struct ERROR_INFO errorInfo = {errorMessages[errorMsgIdx], GetLastError()};
         handleError(errorInfo);
     }
@@ -53,7 +53,7 @@ void generateHash(TCHAR *filePath, char *hash) {
                              CRYPT_VERIFYCONTEXT)) {
         CloseHandle(hFile);
 
-        enum errorMsgResolver errorMsgIdx = CryptAcquireCtxError;
+        enum ErrorMsgResolver errorMsgIdx = CryptAcquireCtxError;
         struct ERROR_INFO errorInfo = {errorMessages[errorMsgIdx], GetLastError()};
         handleError(errorInfo);
     }
@@ -63,7 +63,7 @@ void generateHash(TCHAR *filePath, char *hash) {
         CloseHandle(hFile);
         CryptReleaseContext(hProv, 0);
 
-        enum errorMsgResolver errorMsgIdx = CryptCreateHashError;
+        enum ErrorMsgResolver errorMsgIdx = CryptCreateHashError;
         struct ERROR_INFO errorInfo = {errorMessages[errorMsgIdx], GetLastError()};
         handleError(errorInfo);
     }
@@ -75,7 +75,7 @@ void generateHash(TCHAR *filePath, char *hash) {
         }
         if (!CryptHashData(hHash, rgbFile, cbRead, 0)) {
             cleanUpResources(hProv, hHash, hFile);
-            enum errorMsgResolver errorMsgIdx = CryptHashDataError;
+            enum ErrorMsgResolver errorMsgIdx = CryptHashDataError;
             struct ERROR_INFO errorInfo = {errorMessages[errorMsgIdx], GetLastError()};
             handleError(errorInfo);
         }
@@ -95,7 +95,7 @@ void generateHash(TCHAR *filePath, char *hash) {
 
     if (!bResult) {
         cleanUpResources(hProv, hHash, hFile);
-        enum errorMsgResolver errorMsgIdx = fileReadError;
+        enum ErrorMsgResolver errorMsgIdx = FileReadError;
         struct ERROR_INFO errorInfo = {errorMessages[errorMsgIdx], GetLastError()};
     }
     cbHash = MD5LEN;

diff --git a/src/proc/mainwindowProc.c b/src/proc/mainwindowProc.c
@@ -74,7 +74,7 @@ void copyToClipBoard(HWND parent, const char *hashText) {
             CloseClipboard();
             SetWindowText(infoHolderLabel, "Copied to clipboard");
         } else {
-            enum errorMsgResolver errorMsgIdx = clipboardError;
+            enum ErrorMsgResolver errorMsgIdx = ClipboardError;
             SetWindowText(infoHolderLabel, errorMessages[errorMsgIdx]);
         }
     }