From fdf504459a2e4a4903c9d63dfaee909705661bea Mon Sep 17 00:00:00 2001
From: Patrick Allaert
Date: Thu, 13 Oct 2022 16:49:56 +0200
Subject: Revert "Minor refactor"

This reverts commit 90bdf39000d2f09534b387d39203819995fb948e.

Caused compilation failure with PHP compiled with ZTS.
---
 src/sp_config.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/sp_config.c')

diff --git a/src/sp_config.c b/src/sp_config.c
index ff6cdd9..dbccb1a 100644
--- a/src/sp_config.c
+++ b/src/sp_config.c
@@ -4,7 +4,9 @@
 
 #include "php_snuffleupagus.h"
 
-static const sp_config_keyword sp_func[] = {
+
+static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) {
+  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))},
@@ -23,10 +25,7 @@ static const sp_config_keyword sp_func[] = {
     {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}
-};
-
-static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) {
+    {NULL, NULL, NULL}};
   return sp_process_rule(parsed_rule, sp_func);
 }
 
-- 
cgit v1.3