2 files changed, 13 insertions, 11 deletions

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 4c9e904..5bcd57c 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -254,7 +254,7 @@ PHP_MINFO_FUNCTION(snuffleupagus) {
 #define ADD_ASSOC_ZSTR(arr, key, zstr) if (zstr) { add_assoc_str(arr, key, zstr); } else { add_assoc_null(arr, key); }
 #define ADD_ASSOC_REGEXP(arr, key, regexp) if (regexp && regexp->pattern) { add_assoc_str(arr, key, regexp->pattern); } else { add_assoc_null(arr, key); }
 
-static void add_df_to_arr(zval *arr, sp_disabled_function *df) {
+static void add_df_to_arr(zval *arr, sp_disabled_function const *const df) {
   zval arr_df;
   array_init(&arr_df);
 
@@ -365,7 +365,7 @@ static void dump_config() {
   if (splist) { \
     zval arr_sp; \
     array_init(&arr_sp); \
-    for (sp_list_node *p = splist; p; p = p->next) { add_next_index_str(&arr_sp, p->data); } \
+    for (const sp_list_node *p = splist; p; p = p->next) { add_next_index_str(&arr_sp, p->data); } \
     add_assoc_zval(arr, key, &arr_sp); \
   } else { add_assoc_null(arr, key); }
 
@@ -381,6 +381,8 @@ static void dump_config() {
 
   ADD_ASSOC_SPLIST(&arr, SP_TOKEN_ALLOW_WRAPPERS, SPCFG(wrapper).whitelist);
 
+#undef ADD_ASSOC_SPLIST
+
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." SP_TOKEN_ENABLE, SPCFG(ini).enable);
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." SP_TOKEN_SIM, SPCFG(ini).simulation);
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." "policy_ro", SPCFG(ini).policy_readonly);
@@ -392,7 +394,7 @@ static void dump_config() {
     zval arr_ini;
     array_init(&arr_ini);
 
-    sp_ini_entry *sp_entry;
+    const sp_ini_entry *sp_entry;
     ZEND_HASH_FOREACH_PTR(SPCFG(ini).entries, sp_entry)
       zval arr_ini_entry;
       array_init(&arr_ini_entry);
@@ -442,7 +444,8 @@ static void dump_config() {
   zval arr_dfs;
   array_init(&arr_dfs);
   size_t num_df = 0;
-  sp_list_node *dflist, *dfp;
+  const sp_list_node *dflist;
+  const sp_list_node *dfp;
   ZEND_HASH_FOREACH_PTR(SPCFG(disabled_functions), dflist)
     for (dfp = dflist; dfp; dfp = dfp->next) {
       add_df_to_arr(&arr_dfs, dfp->data);
@@ -597,7 +600,7 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     (SPCFG(disabled_functions_ret) && zend_hash_num_elements(SPCFG(disabled_functions_ret)));
 
   if (SPCFG(show_old_php_warning) && getenv("SP_SKIP_OLD_PHP_CHECK") == NULL) {
-    time_t ts = time(NULL);
+    const time_t ts = time(NULL);
     if ((PHP_VERSION_ID < 70300) ||
         (PHP_VERSION_ID < 70400 && ts >= (time_t)1638745200L) ||
         (PHP_VERSION_ID < 80000 && ts >= (time_t)1669590000L) ||
diff --git a/src/sp_ini.c b/src/sp_ini.c
index 7fec297..ed23fb7 100644
--- a/src/sp_ini.c
+++ b/src/sp_ini.c
@@ -12,12 +12,12 @@
   }
 
 
-static bool /* success */ sp_ini_check(zend_string *varname, zend_string *new_value, sp_ini_entry **sp_entry_p) {
+static bool /* success */ sp_ini_check(zend_string *const restrict varname, zend_string const *const restrict new_value, sp_ini_entry **sp_entry_p) {
   if (!varname || ZSTR_LEN(varname) == 0) {
     return false;
   }
 
-  sp_config_ini *cfg = &(SPCFG(ini));
+  sp_config_ini const* const cfg = &(SPCFG(ini));
   sp_ini_entry *entry = zend_hash_find_ptr(cfg->entries, varname);
   if (sp_entry_p) {
     *sp_entry_p = entry;
@@ -76,10 +76,9 @@ static bool /* success */ sp_ini_check(zend_string *varname, zend_string *new_va
 }
 
 static PHP_INI_MH(sp_ini_onmodify) {
-  zend_ini_entry *ini_entry = entry;
   sp_ini_entry *sp_entry = NULL;
 
-  if (!sp_ini_check(ini_entry->name, new_value, &sp_entry)) {
+  if (!sp_ini_check(entry->name, new_value, &sp_entry)) {
     return FAILURE;
   }
 
@@ -91,7 +90,7 @@ static PHP_INI_MH(sp_ini_onmodify) {
 }
 
 void sp_hook_ini() {
-  sp_config_ini *cfg = &(SPCFG(ini));
+  sp_config_ini const* const cfg = &(SPCFG(ini));
   sp_ini_entry *sp_entry;
   zend_ini_entry *ini_entry;
   ZEND_HASH_FOREACH_PTR(cfg->entries, sp_entry)
@@ -126,8 +125,8 @@ void sp_hook_ini() {
 
 void sp_unhook_ini() {
   sp_ini_entry *sp_entry;
-  zend_ini_entry *ini_entry;
   ZEND_HASH_FOREACH_PTR(SPCFG(ini).entries, sp_entry)
+    zend_ini_entry *ini_entry;
     if (!sp_entry->orig_onmodify) {
       // not hooked or no original onmodify
       continue;