refactor: added -Wextra to CFLAGS

7 files changed, 17 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index cc5cb87..8096fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-Wall -iquote ./analyzer -O2 -flto -s
+CFLAGS=-Wall -Wextra -iquote ./analyzer -O2 -flto -s
 
 global: compile
 	sudo mv branal /usr/bin
diff --git a/analyzer/commands.c b/analyzer/commands.c
index 912bdf0..676c78d 100644
--- a/analyzer/commands.c
+++ b/analyzer/commands.c
@@ -28,6 +28,9 @@ int longest_command_length() {
 
 // help command handler
 int print_help(int argc, char *argv[]) {
+    (void)argc;
+    (void)argv;
+
     int len = longest_command_length();
 
     printf("A bare-bones analyzer for the game Broken Ranks\n");
@@ -52,6 +55,9 @@ int print_help(int argc, char *argv[]) {
 
 // live analyzer command handler
 int live_anal(int argc, char *argv[]) {
+    (void)argc;
+    (void)argv;
+
     // TODO: implement
     printf("Not implemented\n");
     return 1;
@@ -70,7 +76,7 @@ int file_anal(int argc, char *argv[]) {
         return 1;
     }
 
-    for (size_t i = 2; i < argc; i++) {
+    for (size_t i = 2; i < (size_t)argc; i++) {
         printf("FILE: %s\n", argv[i]);
         analyze_file(argv[i]);
         printf("\n");
diff --git a/analyzer/parser/fight_results/fight_results.c b/analyzer/parser/fight_results/fight_results.c
index efc4b36..3adf67b 100644
--- a/analyzer/parser/fight_results/fight_results.c
+++ b/analyzer/parser/fight_results/fight_results.c
@@ -39,7 +39,7 @@ byte_t *find_fight_results(TCPStream *stream, int offset, int *length) {
     byte_t *end = NULL;
     if (start)
         end = memmem(start, stream->len - (start - stream->data), FIGHT_RESULTS_END, strlen(FIGHT_RESULTS_END));
-    *length = end ? end - start + strlen(FIGHT_RESULTS_END) : -1;
+    *length = end ? (int)(end - start + strlen(FIGHT_RESULTS_END)) : -1;
     return start;
 }
 
@@ -55,7 +55,7 @@ void add_gear(FriendlyResults *results, size_t *items_capacity, char *gears_str)
     char *gears_separator;
     do {
         gears_separator = strstr(gears_str, SEPARATOR_GEAR);
-        size_t len = gears_separator ? gears_separator - gears_str : strlen(gears_str);
+        size_t len = gears_separator ? (size_t)(gears_separator - gears_str) : strlen(gears_str);
         Gear gear = {0};
         fill_struct(&gear, gear_fields, ARR_LEN(gear_fields), gears_str, len, SEPARATOR_GEAR_FIELD);
 
@@ -135,7 +135,7 @@ void add_drifs(FriendlyResults *results, size_t *items_capacity, char *drifs_str
     char *drifs_separator;
     do {
         drifs_separator = strstr(drifs_str, SEPARATOR_DRIF);
-        size_t len = drifs_separator ? drifs_separator - drifs_str : strlen(drifs_str);
+        size_t len = drifs_separator ? (size_t)(drifs_separator - drifs_str) : strlen(drifs_str);
         Drif drif = {0};
         fill_struct(&drif, drif_fields, ARR_LEN(drif_fields), drifs_str, len, SEPARATOR_DRIF_FIELD);
 
@@ -228,7 +228,7 @@ ParsedData parse_fight_results(byte_t *data, size_t length) {
     do {
         // get generic entity results
         entity_separator = memmem(data, length, SEPARATOR_ENTITY, strlen(SEPARATOR_ENTITY));
-        size_t len = entity_separator ? entity_separator - data : length;
+        size_t len = entity_separator ? (size_t)(entity_separator - data) : length;
         EntityResults entity_results = {0};
         fill_struct(&entity_results, entity_fields, ARR_LEN(entity_fields), (char *)data, len, SEPARATOR_ENTITY_FIELD);
 
diff --git a/analyzer/parser/structs.c b/analyzer/parser/structs.c
index dedf0d1..28376e5 100644
--- a/analyzer/parser/structs.c
+++ b/analyzer/parser/structs.c
@@ -9,7 +9,7 @@
 void fill_struct(void *obj, const StructField *fields, size_t n_fields, const char *data, size_t data_len, const char *sep) {
     for (size_t i = 0; i < n_fields; i++) {
         char *next_sep = memmem(data, data_len, sep, strlen(sep));
-        size_t len = next_sep ? next_sep - data : data_len;
+        size_t len = next_sep ? (size_t)(next_sep - data) : data_len;
 
         char *str = safe_malloc(len + 1);
         memcpy(str, data, len);
diff --git a/analyzer/render.h b/analyzer/render.h
index 911ca76..c28f3e3 100644
--- a/analyzer/render.h
+++ b/analyzer/render.h
@@ -38,7 +38,7 @@ static const ColumnInfo columns[] = {
     {"Saturation", 13, COLOR_GREEN},
     {"Splinters", 9, COLOR_BLUE},
 };
-static const inline size_t sum_col_widths() {
+inline static size_t sum_col_widths() {
     size_t sum = 0;
     for (size_t i = 0; i < ARR_LEN(columns); i++)
         sum += columns[i].width;
diff --git a/analyzer/utils/roman.c b/analyzer/utils/roman.c
index 4fbe5c0..2086edc 100644
--- a/analyzer/utils/roman.c
+++ b/analyzer/utils/roman.c
@@ -4,7 +4,7 @@
 
 #include "utils/memory.h"
 
-void to_roman(char *buffer, int number) {
+void to_roman(char *buffer, unsigned int number) {
     buffer[0] = '\0';
     for (size_t i = 0; i < ARR_LEN(roman_symbols); i++) {
         for (size_t j = 0; j < number / roman_symbols[i].num; j++) {
diff --git a/analyzer/utils/roman.h b/analyzer/utils/roman.h
index cebd16e..572f866 100644
--- a/analyzer/utils/roman.h
+++ b/analyzer/utils/roman.h
@@ -2,7 +2,7 @@
 // functions for roman numbers
 
 typedef struct {
-    int num;
+    unsigned int num;
     char *symbol;
 } RomanSymbol;
 
@@ -26,4 +26,4 @@ static const RomanSymbol roman_symbols[] = {
 // params:
 //      buffer - buffer to save the roman number to
 //      number - arabic number to convert
-extern void to_roman(char *buffer, int number);
+extern void to_roman(char *buffer, unsigned int number);