summaryrefslogtreecommitdiff
path: root/src/sp_config_keywords.c
diff options
context:
space:
mode:
authorxXx-caillou-xXx2018-08-28 18:16:11 +0200
committerjvoisin2018-08-28 16:16:11 +0000
commita0300b15a3afffe02c737d263c3d6dd31ac307b7 (patch)
tree0f03abc2ae41653c61de2e34a93292b15a200046 /src/sp_config_keywords.c
parent888242c30d822392953e1b5f4fc289a96e9da5e0 (diff)
Fix some compilation warnings
Diffstat (limited to 'src/sp_config_keywords.c')
-rw-r--r--src/sp_config_keywords.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 13a2f89..93077c6 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -10,7 +10,7 @@ static int parse_enable(char *line, bool *restrict retval,
10 {parse_empty, SP_TOKEN_ENABLE, &(enable)}, 10 {parse_empty, SP_TOKEN_ENABLE, &(enable)},
11 {parse_empty, SP_TOKEN_DISABLE, &(disable)}, 11 {parse_empty, SP_TOKEN_DISABLE, &(disable)},
12 {parse_empty, SP_TOKEN_SIMULATION, simulation}, 12 {parse_empty, SP_TOKEN_SIMULATION, simulation},
13 {0}}; 13 {0, 0, 0}};
14 14
15 int ret = parse_keywords(sp_config_funcs, line); 15 int ret = parse_keywords(sp_config_funcs, line);
16 16
@@ -35,7 +35,7 @@ int parse_session(char *line) {
35 sp_config_functions sp_config_funcs_session_encryption[] = { 35 sp_config_functions sp_config_funcs_session_encryption[] = {
36 {parse_empty, SP_TOKEN_ENCRYPT, &(session->encrypt)}, 36 {parse_empty, SP_TOKEN_ENCRYPT, &(session->encrypt)},
37 {parse_empty, SP_TOKEN_SIMULATION, &(session->simulation)}, 37 {parse_empty, SP_TOKEN_SIMULATION, &(session->simulation)},
38 {0}}; 38 {0, 0, 0}};
39 int ret = parse_keywords(sp_config_funcs_session_encryption, line); 39 int ret = parse_keywords(sp_config_funcs_session_encryption, line);
40 if (0 != ret) { 40 if (0 != ret) {
41 return ret; 41 return ret;
@@ -104,7 +104,7 @@ int parse_unserialize(char *line) {
104 {parse_empty, SP_TOKEN_DISABLE, &(disable)}, 104 {parse_empty, SP_TOKEN_DISABLE, &(disable)},
105 {parse_empty, SP_TOKEN_SIMULATION, &(unserialize->simulation)}, 105 {parse_empty, SP_TOKEN_SIMULATION, &(unserialize->simulation)},
106 {parse_str, SP_TOKEN_DUMP, &(unserialize->dump)}, 106 {parse_str, SP_TOKEN_DUMP, &(unserialize->dump)},
107 {0}}; 107 {0, 0, 0}};
108 108
109 unserialize->textual_representation = zend_string_init(line, strlen(line), 1); 109 unserialize->textual_representation = zend_string_init(line, strlen(line), 1);
110 110
@@ -134,7 +134,7 @@ int parse_readonly_exec(char *line) {
134 {parse_empty, SP_TOKEN_DISABLE, &(disable)}, 134 {parse_empty, SP_TOKEN_DISABLE, &(disable)},
135 {parse_empty, SP_TOKEN_SIMULATION, &(readonly_exec->simulation)}, 135 {parse_empty, SP_TOKEN_SIMULATION, &(readonly_exec->simulation)},
136 {parse_str, SP_TOKEN_DUMP, &(readonly_exec->dump)}, 136 {parse_str, SP_TOKEN_DUMP, &(readonly_exec->dump)},
137 {0}}; 137 {0, 0, 0}};
138 138
139 readonly_exec->textual_representation = 139 readonly_exec->textual_representation =
140 zend_string_init(line, strlen(line), 1); 140 zend_string_init(line, strlen(line), 1);
@@ -161,7 +161,7 @@ int parse_global(char *line) {
161 &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key)}, 161 &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key)},
162 {parse_str, SP_TOKEN_ENV_VAR, 162 {parse_str, SP_TOKEN_ENV_VAR,
163 &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var)}, 163 &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var)},
164 {0}}; 164 {0, 0, 0}};
165 return parse_keywords(sp_config_funcs_global, line); 165 return parse_keywords(sp_config_funcs_global, line);
166} 166}
167 167
@@ -174,7 +174,7 @@ static int parse_eval_filter_conf(char *line, sp_list_node **list) {
174 {parse_empty, SP_TOKEN_SIMULATION, 174 {parse_empty, SP_TOKEN_SIMULATION,
175 &(SNUFFLEUPAGUS_G(config).config_eval->simulation)}, 175 &(SNUFFLEUPAGUS_G(config).config_eval->simulation)},
176 {parse_str, SP_TOKEN_DUMP, &(SNUFFLEUPAGUS_G(config).config_eval->dump)}, 176 {parse_str, SP_TOKEN_DUMP, &(SNUFFLEUPAGUS_G(config).config_eval->dump)},
177 {0}}; 177 {0, 0, 0}};
178 178
179 eval->textual_representation = zend_string_init(line, strlen(line), 1); 179 eval->textual_representation = zend_string_init(line, strlen(line), 1);
180 180
@@ -194,7 +194,7 @@ int parse_wrapper_whitelist(char *line) {
194 sp_config_functions sp_config_funcs[] = { 194 sp_config_functions sp_config_funcs[] = {
195 {parse_list, SP_TOKEN_LIST, 195 {parse_list, SP_TOKEN_LIST,
196 &SNUFFLEUPAGUS_G(config).config_wrapper->whitelist}, 196 &SNUFFLEUPAGUS_G(config).config_wrapper->whitelist},
197 {0}}; 197 {0, 0, 0}};
198 int ret = parse_keywords(sp_config_funcs, line); 198 int ret = parse_keywords(sp_config_funcs, line);
199 if (0 != ret) { 199 if (0 != ret) {
200 return ret; 200 return ret;
@@ -223,7 +223,7 @@ int parse_cookie(char *line) {
223 {parse_str, SP_TOKEN_SAMESITE, &samesite}, 223 {parse_str, SP_TOKEN_SAMESITE, &samesite},
224 {parse_empty, SP_TOKEN_ENCRYPT, &cookie->encrypt}, 224 {parse_empty, SP_TOKEN_ENCRYPT, &cookie->encrypt},
225 {parse_empty, SP_TOKEN_SIMULATION, &cookie->simulation}, 225 {parse_empty, SP_TOKEN_SIMULATION, &cookie->simulation},
226 {0}}; 226 {0, 0, 0}};
227 227
228 ret = parse_keywords(sp_config_funcs_cookie_encryption, line); 228 ret = parse_keywords(sp_config_funcs_cookie_encryption, line);
229 if (0 != ret) { 229 if (0 != ret) {
@@ -338,7 +338,7 @@ int parse_disabled_functions(char *line) {
338 {parse_str, SP_TOKEN_LOCAL_VAR, &(var)}, 338 {parse_str, SP_TOKEN_LOCAL_VAR, &(var)},
339 {parse_str, SP_TOKEN_VALUE_ARG_POS, &(pos)}, 339 {parse_str, SP_TOKEN_VALUE_ARG_POS, &(pos)},
340 {parse_str, SP_TOKEN_LINE_NUMBER, &(line_number)}, 340 {parse_str, SP_TOKEN_LINE_NUMBER, &(line_number)},
341 {0}}; 341 {0, 0, 0}};
342 342
343 ret = parse_keywords(sp_config_funcs_disabled_functions, line); 343 ret = parse_keywords(sp_config_funcs_disabled_functions, line);
344 344
@@ -525,7 +525,7 @@ int parse_upload_validation(char *line) {
525 &(SNUFFLEUPAGUS_G(config).config_upload_validation->simulation)}, 525 &(SNUFFLEUPAGUS_G(config).config_upload_validation->simulation)},
526 {parse_empty, SP_TOKEN_ENABLE, &(enable)}, 526 {parse_empty, SP_TOKEN_ENABLE, &(enable)},
527 {parse_empty, SP_TOKEN_DISABLE, &(disable)}, 527 {parse_empty, SP_TOKEN_DISABLE, &(disable)},
528 {0}}; 528 {0, 0, 0}};
529 529
530 int ret = parse_keywords(sp_config_funcs_upload_validation, line); 530 int ret = parse_keywords(sp_config_funcs_upload_validation, line);
531 531