From 54c352c1b5aa08b187dd1e52e544709cad2b0fee Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 23 Sep 2021 12:23:40 +0200
Subject: config is stack allocated now + some code improvements (see details)

* for easier memory manegement, the entire sp_config struct was merged into snuffleupagus_globals and allocated on stack where possible
* SNUFFLEUPAGUS_G() can be written as SPG(), which is faster to type and easier to read
* execution_depth is re-initialized to 0 for each request
* function calls with inline string and length parameters consistently use ZEND_STRL instead of sizeof()-1
* execution is actually hooked if recursion protection is enabled
* some line breaks were removed to make the code more readable
---
 src/sp_ini.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sp_ini.c')

diff --git a/src/sp_ini.c b/src/sp_ini.c
index 5777ca3..2238e3a 100644
--- a/src/sp_ini.c
+++ b/src/sp_ini.c
@@ -17,7 +17,7 @@ static bool /* success */ sp_ini_check(zend_string *varname, zend_string *new_va
     return false;
   }
 
-  sp_config_ini *cfg = SNUFFLEUPAGUS_G(config).config_ini;
+  sp_config_ini *cfg = &(SPCFG(ini));
   sp_ini_entry *entry = zend_hash_find_ptr(cfg->entries, varname);
   if (sp_entry_p) {
     *sp_entry_p = entry;
@@ -92,7 +92,7 @@ static PHP_INI_MH(sp_ini_onmodify) {
 }
 
 void sp_hook_ini() {
-  sp_config_ini *cfg = SNUFFLEUPAGUS_G(config).config_ini;
+  sp_config_ini *cfg = &(SPCFG(ini));
   sp_ini_entry *sp_entry;
   zend_ini_entry *ini_entry;
   ZEND_HASH_FOREACH_PTR(cfg->entries, sp_entry)
@@ -129,7 +129,7 @@ void sp_hook_ini() {
 void sp_unhook_ini() {
   sp_ini_entry *sp_entry;
   zend_ini_entry *ini_entry;
-  ZEND_HASH_FOREACH_PTR(SNUFFLEUPAGUS_G(config).config_ini->entries, sp_entry)
+  ZEND_HASH_FOREACH_PTR(SPCFG(ini).entries, sp_entry)
     if (!sp_entry->orig_onmodify) {
       // not hooked or no original onmodify
       continue;
-- 
cgit v1.3