diff options
| author | jvoisin | 2017-10-12 01:04:59 +0200 |
|---|---|---|
| committer | jvoisin | 2017-10-12 01:04:59 +0200 |
| commit | 4e98405c80d80b21f23b133f92f79b23aaac6bad (patch) | |
| tree | c1ebe318c599b38322fe24938e4168c1975483ce /src/sp_config_keywords.c | |
| parent | 9d284d6d8d489d231d20c8eef0035bdf01a2cbfe (diff) | |
Fix minor gcc warnings with experimental options
`CFLAGS='-Wnull-dereference -Wlogical-op -Wshadow -Wjump-misses-init' make clean coverage`
Diffstat (limited to 'src/sp_config_keywords.c')
| -rw-r--r-- | src/sp_config_keywords.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index e71463a..5e31c41 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c | |||
| @@ -40,7 +40,7 @@ static int get_construct_type(sp_disabled_function const *const df) { | |||
| 40 | } else if (df->r_function) { | 40 | } else if (df->r_function) { |
| 41 | if (true == is_regexp_matching(df->r_function, mapping[i].keys[j])) { | 41 | if (true == is_regexp_matching(df->r_function, mapping[i].keys[j])) { |
| 42 | return mapping[i].type; | 42 | return mapping[i].type; |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| @@ -96,13 +96,13 @@ int parse_readonly_exec(char *line) { | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | int parse_global(char *line) { | 98 | int parse_global(char *line) { |
| 99 | sp_config_functions sp_config_global[] = { | 99 | sp_config_functions sp_config_funcs_global[] = { |
| 100 | {parse_str, SP_TOKEN_ENCRYPTION_KEY, | 100 | {parse_str, SP_TOKEN_ENCRYPTION_KEY, |
| 101 | &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key)}, | 101 | &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key)}, |
| 102 | {parse_str, SP_TOKEN_ENV_VAR, | 102 | {parse_str, SP_TOKEN_ENV_VAR, |
| 103 | &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var)}, | 103 | &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var)}, |
| 104 | {0}}; | 104 | {0}}; |
| 105 | return parse_keywords(sp_config_global, line); | 105 | return parse_keywords(sp_config_funcs_global, line); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | int parse_cookie_encryption(char *line) { | 108 | int parse_cookie_encryption(char *line) { |
