Normalise property name capitalisation

1 files changed, 34 insertions, 34 deletions

diff --git a/main.c b/main.c

index 9ab4181..487f700 100644
--- a/main.c
+++ b/main.c
@@ -17,11 +17,11 @@ typedef struct
 {
     char** patterns;
     char** allowed_patterns;
-    char** allowedIps;
+    char** allowed_ips;
     // size_t allowedIpCount;
-    char** bannedIps;
-    size_t bannedIpCount;
-    size_t bannedIpSize;
+    char** banned_ips;
+    size_t banned_ip_count;
+    size_t banned_ip_size;
 } MatchRules;
 
 bool print_allowed_ip = false;
@@ -107,10 +107,10 @@ void read_lines_cb(const char* filename, void cb(char*, void*), void* cbData)
         if (print_progress && count % 10 == 0)
         {
             double elapsed = (clock() - lastPrint) * 1000.0 / CLOCKS_PER_SEC;
-            double totalElapsed = (clock() - ctime) * 1000.0 / CLOCKS_PER_SEC;
+            double elapsed_total = (clock() - ctime) * 1000.0 / CLOCKS_PER_SEC;
             if (elapsed > 50.0)
             {
-                fprintf(stderr, "\rRead %d lines from %s in %.3f ms (%.3f/s)\r", count, filename, totalElapsed, count / (totalElapsed / 1000.0));
+                fprintf(stderr, "\rRead %d lines from %s in %.3f ms (%.3f/s)\r", count, filename, elapsed_total, count / (elapsed_total / 1000.0));
                 lastPrint = clock();
             }
         }
@@ -229,23 +229,23 @@ void process_line(char* line, void* cbData)
     // printf("meow %s\n", ip);
 
 
-    for (int j = 0; rules->allowedIps[j] != NULL; j++)
+    for (int j = 0; rules->allowed_ips[j] != NULL; j++)
     {
-        if (strstr(ip, rules->allowedIps[j]) == ip)
+        if (strstr(ip, rules->allowed_ips[j]) == ip)
         {
             if (print_allowed_ip)
-                printf("Allowed IP: \"%s\" (~%s): %s\n", ip, rules->allowedIps[j], line);
+                printf("Allowed IP: \"%s\" (~%s): %s\n", ip, rules->allowed_ips[j], line);
             free(ip);
             return;
         }
     }
 
-    for (size_t j = 0; j < rules->bannedIpCount; j++)
+    for (size_t j = 0; j < rules->banned_ip_count; j++)
     {
-        if (strstr(ip, rules->bannedIps[j]) == ip)
+        if (strstr(ip, rules->banned_ips[j]) == ip)
         {
             if (print_already_banned_ip)
-                printf("Banned IP: \"%s\": %s\n", rules->bannedIps[j], line);
+                printf("Banned IP: \"%s\": %s\n", rules->banned_ips[j], line);
             free(ip);
             return;
         }
@@ -265,18 +265,18 @@ void process_line(char* line, void* cbData)
     {
         if (strstr(line, rules->patterns[i]) != NULL)
         {
-            if (rules->bannedIpCount >= rules->bannedIpSize)
+            if (rules->banned_ip_count >= rules->banned_ip_size)
             {
-                rules->bannedIpSize *= 2;
-                rules->bannedIps = grow_string_array(rules->bannedIps, rules->bannedIpSize);
+                rules->banned_ip_size *= 2;
+                rules->banned_ips = grow_string_array(rules->banned_ips, rules->banned_ip_size);
             }
 
-            rules->bannedIps[rules->bannedIpCount] = ip;
-            rules->bannedIps[rules->bannedIpCount][strcspn(rules->bannedIps[rules->bannedIpCount], "\n")] = 0;
-            rules->bannedIps[rules->bannedIpCount + 1] = nullptr;
-            rules->bannedIpCount++;
+            rules->banned_ips[rules->banned_ip_count] = ip;
+            rules->banned_ips[rules->banned_ip_count][strcspn(rules->banned_ips[rules->banned_ip_count], "\n")] = 0;
+            rules->banned_ips[rules->banned_ip_count + 1] = nullptr;
+            rules->banned_ip_count++;
             if (print_bans)
-                printf("[Bans=%6lu] %15s matched pattern %4d (\"%s\"): %s\n", rules->bannedIpCount, ip, i, rules->patterns[i], line);
+                printf("[Bans=%6lu] %15s matched pattern %4d (\"%s\"): %s\n", rules->banned_ip_count, ip, i, rules->patterns[i], line);
 
             if (print_only) return;
 
@@ -397,10 +397,10 @@ int main(int argc, char* argv[])
     MatchRules rules;
     rules.patterns = read_lines(patterns_path);
     rules.allowed_patterns = read_lines(allowed_patterns_path);
-    rules.allowedIps = read_lines(allowed_ips_path);
-    rules.bannedIpSize = 8;
-    rules.bannedIpCount = 0;
-    rules.bannedIps = xmalloc(sizeof(char**) * rules.bannedIpSize);
+    rules.allowed_ips = read_lines(allowed_ips_path);
+    rules.banned_ip_size = 8;
+    rules.banned_ip_count = 0;
+    rules.banned_ips = xmalloc(sizeof(char**) * rules.banned_ip_size);
     //rules.bannedIps[0] = ;
 
     if (dump_patterns)
@@ -414,34 +414,34 @@ int main(int argc, char* argv[])
         {
             printf("[ALLOWED %4d] %s\n", i, rules.allowed_patterns[i]);
         }
-        for (int i = 0; rules.allowedIps[i] != NULL; i++)
+        for (int i = 0; rules.allowed_ips[i] != NULL; i++)
         {
-            printf("[ALL. IP %4d] %s\n", i, rules.allowedIps[i]);
+            printf("[ALL. IP %4d] %s\n", i, rules.allowed_ips[i]);
         }
         return 0;
     }
 
     read_lines_cb(access_log_path, process_line, &rules);
 
-    fprintf(stderr, "Banned %lu IPs:\n", rules.bannedIpCount);
+    fprintf(stderr, "Banned %lu IPs:\n", rules.banned_ip_count);
 
-    for (int i = 0; rules.bannedIps[i] != NULL; i++)
+    for (int i = 0; rules.banned_ips[i] != NULL; i++)
     {
-        free(rules.bannedIps[i]);
+        free(rules.banned_ips[i]);
     }
-    free(rules.bannedIps);
+    free(rules.banned_ips);
 
     for (int i = 0; rules.patterns[i] != NULL; i++)
     {
         free(rules.patterns[i]);
     }
     free(rules.patterns);
-    free(rules.allowedIps);
-    for (int i = 0; rules.bannedIps[i] != NULL; i++)
+    free(rules.allowed_ips);
+    for (int i = 0; rules.banned_ips[i] != NULL; i++)
     {
-        free(rules.bannedIps[i]);
+        free(rules.banned_ips[i]);
     }
-    free(rules.bannedIps);
+    free(rules.banned_ips);
 
     return 0;
 }