fix some compiler warnings

Author: cen1

src/bncsutil/cdkeydecoder.cpp

@@ -422,12 +422,12 @@ int CDKeyDecoder::processWarCraft2Key() {
         cdkey[j] = c;
         if (c <= '7') {
             v = v2;
-            c2 = ((char) (v & 0xFF)) & 7 ^ c;
+            c2 = (((char) (v & 0xFF)) & 7) ^ c;
             v >>= 3;
             cdkey[j] = (char) c2;
             v2 = v;
         } else if (c < 'A') {
-            cdkey[j] = ((char) j) & 1 ^ c;
+            cdkey[j] = (((char) j) & 1) ^ c;
         }
     }
 
@@ -527,14 +527,14 @@ void CDKeyDecoder::decodeKeyTable(int* keyTable) {
                 /*
                 ecx = (j & 7) << 2;
                 ebp = (keyTable[0x3 - (j >> 3)] & (0xF << ecx)) >> ecx;
-                varC = w3TranslateMap[ebp ^ w3TranslateMap[varC + i] + i];
+                varC = w3TranslateMap[ebp ^ (w3TranslateMap[varC + i] + i)];
                 */
                 ecx = (j & 7) << 2;
                 //ebp = (keyTable[0x3 - (j >> 3)] & (0xF << ecx)) >> ecx;
                 ebp = (keyTable[0x3 - (j >> 3)]);
                 ebp &= (0xF << ecx);
                 ebp = ebp >> ecx;
-                varC = w3TranslateMap[ebp ^ w3TranslateMap[varC + i] + i];
+                varC = w3TranslateMap[ebp ^ (w3TranslateMap[varC + i] + i)];
             }
         }
 
@@ -551,7 +551,7 @@ void CDKeyDecoder::decodeKeyTable(int* keyTable) {
 
         j = 3 - var4;
         ebx = (w3TranslateMap[varC + i] & 0xF) << esi;
-        keyTable[j] = (ebx | ~(0xF << esi) & ((int) keyTable[j]));
+        keyTable[j] = (ebx | (~(0xF << esi) & ((int) keyTable[j])));
     } while ((i -= 16) >= 0);
 
     // pass 2

src/bncsutil/checkrevision.cpp

@@ -219,7 +219,7 @@ MEXP(int) checkRevision(const char* formula, const char* files[], int numFiles,
     values[0] ^= checkrevision_seeds[mpqNumber];
 
     for (int i = 0; i < numFiles; i++) {
-        size_t file_len, remainder, rounded_size, buffer_size;
+        size_t file_len, remainder, buffer_size;
 
         f = file_open(files[i], FILE_READ);
         if (!f) {

src/bncsutil/file.cpp

@@ -67,7 +67,7 @@ file_t file_open(const char* filename, unsigned int mode)
 
     try {
         data = new _file;
-    } catch (std::bad_alloc) {
+    } catch (const std::bad_alloc&) {
         //bncsutil_debug_message_a("Failed to allocate %u bytes to hold file structure.", sizeof(struct _file));
         CloseHandle(file);
         return (file_t) 0;
@@ -200,7 +200,7 @@ file_t file_open(const char* filename, const unsigned int mode_flags)
 
     try {
         data = new _file;
-    } catch (std::bad_alloc) {
+    } catch (const std::bad_alloc&) {
         //bncsutil_debug_message_a("Failed to allocate %u bytes to hold file structure.", sizeof(struct _file));
         fclose(f);
         return (file_t) 0;