tenseleyflow/gitswitch / 5be3df3

Browse files

fix: resolve compiler warnings for clean NixOS builds

- Change -std=c11 to -std=gnu11 to support ##__VA_ARGS__ extension
- Add -Wp,-U_FORTIFY_SOURCE to debug builds to prevent glibc warning
- Remove unused function remove_existing_account_sections from config.c
Authored by espadonne
SHA
5be3df3d7862b5ef0b7bbf064a322bb9cda217cf
Parents
cdf6178
Tree
b54b70d

2 changed files

StatusFile+-
M Makefile 3 3
M src/config.c 0 29
Makefilemodified
@@ -19,7 +19,7 @@ UNAME_S := $(shell uname -s)
19
19
20
 # Compiler and flags
20
 # Compiler and flags
21
 CC = gcc
21
 CC = gcc
22
-CFLAGS = -std=c11 -Wall -Wextra -Wstrict-prototypes \
22
+CFLAGS = -std=gnu11 -Wall -Wextra -Wstrict-prototypes \
23
          -Wmissing-prototypes -Wold-style-definition -Wredundant-decls \
23
          -Wmissing-prototypes -Wold-style-definition -Wredundant-decls \
24
          -Wbad-function-cast -Wnested-externs -Winit-self \
24
          -Wbad-function-cast -Wnested-externs -Winit-self \
25
          -Wshadow -Wwrite-strings -Wcast-align -Wstrict-aliasing=2 \
25
          -Wshadow -Wwrite-strings -Wcast-align -Wstrict-aliasing=2 \
@@ -50,8 +50,8 @@ ifeq ($(UNAME_S),Darwin)
50
     endif
50
     endif
51
 endif
51
 endif
52
52
53
-# Debug/Release configurations
53
+# Debug/Release configurations
54
-DEBUG_FLAGS = -g -O0 -DDEBUG -fsanitize=address -fsanitize=undefined \
54
+DEBUG_FLAGS = -g -O0 -DDEBUG -Wp,-U_FORTIFY_SOURCE -fsanitize=address -fsanitize=undefined \
55
               -fno-omit-frame-pointer -Wpedantic $(SECURITY_FLAGS_DEBUG)
55
               -fno-omit-frame-pointer -Wpedantic $(SECURITY_FLAGS_DEBUG)
56
 RELEASE_FLAGS = -O2 -DNDEBUG -s $(SECURITY_FLAGS_RELEASE)
56
 RELEASE_FLAGS = -O2 -DNDEBUG -s $(SECURITY_FLAGS_RELEASE)
57
57
src/config.cmodified
@@ -57,7 +57,6 @@ static int validate_config_file_security(const char *config_path);
57
 static int create_config_directory_secure(const char *config_dir);
57
 static int create_config_directory_secure(const char *config_dir);
58
 static int load_accounts_from_toml(gitswitch_ctx_t *ctx, const toml_document_t *doc);
58
 static int load_accounts_from_toml(gitswitch_ctx_t *ctx, const toml_document_t *doc);
59
 static int save_accounts_to_toml(const gitswitch_ctx_t *ctx, toml_document_t *doc);
59
 static int save_accounts_to_toml(const gitswitch_ctx_t *ctx, toml_document_t *doc);
60
-static int remove_existing_account_sections(toml_document_t *doc);
61
 static int parse_account_id_from_section(const char *section_name, uint32_t *account_id);
60
 static int parse_account_id_from_section(const char *section_name, uint32_t *account_id);
62
 static int validate_account_security(const account_t *account);
61
 static int validate_account_security(const account_t *account);
63
 
62
 
@@ -773,34 +772,6 @@ static int validate_account_security(const account_t *account) {
773
     return 0;
772
     return 0;
774
 }
773
 }
775
 
774
 
776
-/* Remove all existing account sections from TOML document */
777
-static int remove_existing_account_sections(toml_document_t *doc) {
778
-    size_t i = 0;
779
-    
780
-    if (!doc) {
781
-        set_error(ERR_INVALID_ARGS, "Invalid arguments to remove_existing_account_sections");
782
-        return -1;
783
-    }
784
-    
785
-    /* Iterate through sections and remove account sections */
786
-    while (i < doc->section_count) {
787
-        if (string_starts_with(doc->sections[i].name, "accounts.")) {
788
-            log_debug("Removing existing account section: %s", doc->sections[i].name);
789
-            
790
-            /* Shift remaining sections down */
791
-            for (size_t j = i; j < doc->section_count - 1; j++) {
792
-                doc->sections[j] = doc->sections[j + 1];
793
-            }
794
-            doc->section_count--;
795
-            /* Don't increment i since we shifted sections down */
796
-        } else {
797
-            i++;
798
-        }
799
-    }
800
-    
801
-    return 0;
802
-}
803
-
804
 /* Save accounts to TOML document */
775
 /* Save accounts to TOML document */
805
 static int save_accounts_to_toml(const gitswitch_ctx_t *ctx, toml_document_t *doc) {
776
 static int save_accounts_to_toml(const gitswitch_ctx_t *ctx, toml_document_t *doc) {
806
     char section_name[64];
777
     char section_name[64];