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(-)

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