From efcc16ad74a32d4b735bad73690c49c5cdb63cb7 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 3 May 2022 00:04:50 +0200 Subject: Add a `const` --- src/sp_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sp_config.c') diff --git a/src/sp_config.c b/src/sp_config.c index 7294b0e..5431eca 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -65,10 +65,10 @@ zend_result sp_parse_config(const char *filename) { } -zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, sp_config_keyword *config_keywords) { +zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, const sp_config_keyword *config_keywords) { for (sp_parsed_keyword *kw = parsed_rule; kw->kw; kw++) { bool found_kw = false; - for (sp_config_keyword *ckw = config_keywords; ckw->func; ckw++) { + for (const sp_config_keyword *ckw = config_keywords; ckw->func; ckw++) { if (kw->kwlen == strlen(ckw->token) && !strncmp(kw->kw, ckw->token, kw->kwlen)) { if (ckw->func) { int ret = ckw->func(ckw->token, kw, ckw->retval); -- cgit v1.3 From 7c2d1d7d2713c0fa6bda63c376baf25d9f3d712c Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 3 May 2022 21:48:35 +0200 Subject: More const frenzy --- src/sp_config.c | 11 +++++------ src/sp_config.h | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/sp_config.c') diff --git a/src/sp_config.c b/src/sp_config.c index 5431eca..d29247b 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -6,7 +6,7 @@ static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { - sp_config_keyword sp_func[] = { + static const sp_config_keyword sp_func[] = { {parse_unserialize, SP_TOKEN_UNSERIALIZE_HMAC, &(SPCFG(unserialize))}, {parse_enable, SP_TOKEN_HARDEN_RANDOM, &(SPCFG(random).enable)}, {parse_log_media, SP_TOKEN_LOG_MEDIA, &(SPCFG(log_media))}, @@ -29,7 +29,7 @@ static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { return sp_process_rule(parsed_rule, sp_func); } -zend_result sp_parse_config(const char *filename) { +zend_result sp_parse_config(const char *const filename) { FILE *fd = fopen(filename, "rb"); if (fd == NULL) { sp_log_err("config", "Could not open configuration file %s : %s", filename, strerror(errno)); @@ -65,7 +65,7 @@ zend_result sp_parse_config(const char *filename) { } -zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, const sp_config_keyword *config_keywords) { +zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, const sp_config_keyword *const config_keywords) { for (sp_parsed_keyword *kw = parsed_rule; kw->kw; kw++) { bool found_kw = false; for (const sp_config_keyword *ckw = config_keywords; ckw->func; ckw++) { @@ -119,13 +119,12 @@ SP_PARSEKW_FN(parse_list) { CHECK_DUPLICATE_KEYWORD(retval); sp_list_node **list = retval; - char *tok, *tmp; SP_PARSE_ARG(value); - tmp = ZSTR_VAL(value); + char* tmp = ZSTR_VAL(value); while (1) { - tok = strsep(&tmp, ","); + const char* const tok = strsep(&tmp, ","); if (tok == NULL) { break; } diff --git a/src/sp_config.h b/src/sp_config.h index 87710a0..3d92f2f 100644 --- a/src/sp_config.h +++ b/src/sp_config.h @@ -176,7 +176,7 @@ typedef struct { HashTable *entries; // ht of sp_ini_entry } sp_config_ini; -#define SP_PARSE_FN_(fname, kwvar) int fname(char *token, sp_parsed_keyword *kwvar, void *retval) +#define SP_PARSE_FN_(fname, kwvar) int fname(char const *const token, sp_parsed_keyword *kwvar, void *retval) #define SP_PARSE_FN(fname) SP_PARSE_FN_(fname, parsed_rule) #define SP_PARSEKW_FN(fname) SP_PARSE_FN_(fname, kw) @@ -269,9 +269,9 @@ typedef struct { #define SP_TOKEN_LIST "list" -zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, const sp_config_keyword *config_keywords); +zend_result sp_process_rule(sp_parsed_keyword *parsed_rule, const sp_config_keyword *const config_keywords); -zend_result sp_parse_config(const char *filename); +zend_result sp_parse_config(const char *const filename); #define SP_PARSE_CHECK_ARG_EXISTS(value) \ if (!value) { \ -- cgit v1.3 From 5843e8ce000d7d41f34de37d3c4baadeb7b34f39 Mon Sep 17 00:00:00 2001 From: Luc Vieillescazes Date: Tue, 17 May 2022 16:25:48 +0200 Subject: Fix ZTS build Bug introduced in https://github.com/jvoisin/snuffleupagus/commit/7c2d1d7d2713c0fa6bda63c376baf25d9f3d712c--- src/sp_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp_config.c') diff --git a/src/sp_config.c b/src/sp_config.c index d29247b..dbccb1a 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -6,7 +6,7 @@ static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { - static const sp_config_keyword sp_func[] = { + sp_config_keyword sp_func[] = { {parse_unserialize, SP_TOKEN_UNSERIALIZE_HMAC, &(SPCFG(unserialize))}, {parse_enable, SP_TOKEN_HARDEN_RANDOM, &(SPCFG(random).enable)}, {parse_log_media, SP_TOKEN_LOG_MEDIA, &(SPCFG(log_media))}, -- cgit v1.3 From 90bdf39000d2f09534b387d39203819995fb948e Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 15 Jul 2022 19:32:56 +0200 Subject: Minor refactor --- src/sp_config.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/sp_config.c') diff --git a/src/sp_config.c b/src/sp_config.c index dbccb1a..ff6cdd9 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -4,9 +4,7 @@ #include "php_snuffleupagus.h" - -static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { - sp_config_keyword sp_func[] = { +static const sp_config_keyword sp_func[] = { {parse_unserialize, SP_TOKEN_UNSERIALIZE_HMAC, &(SPCFG(unserialize))}, {parse_enable, SP_TOKEN_HARDEN_RANDOM, &(SPCFG(random).enable)}, {parse_log_media, SP_TOKEN_LOG_MEDIA, &(SPCFG(log_media))}, @@ -25,7 +23,10 @@ static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { {parse_wrapper_whitelist, SP_TOKEN_ALLOW_WRAPPERS, &(SPCFG(wrapper))}, {parse_ini_protection, SP_TOKEN_INI_PROTECTION, &(SPCFG(ini))}, {parse_ini_entry, SP_TOKEN_INI, NULL}, - {NULL, NULL, NULL}}; + {NULL, NULL, NULL} +}; + +static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) { return sp_process_rule(parsed_rule, sp_func); } -- cgit v1.3