Yet an other pass of clang-format

11 files changed, 49 insertions, 39 deletions

diff --git a/src/sp_config.h b/src/sp_config.h
index cfc3c8f..d2fa64f 100644
--- a/src/sp_config.h
+++ b/src/sp_config.h
@@ -49,15 +49,25 @@ typedef struct {
   zend_string *textual_representation;
 } sp_config_readonly_exec;
 
-typedef struct { bool enable; } sp_config_global_strict;
+typedef struct {
+  bool enable;
+} sp_config_global_strict;
 
-typedef struct { bool enable; } sp_config_random;
+typedef struct {
+  bool enable;
+} sp_config_random;
 
-typedef struct { bool enable; } sp_config_sloppy;
+typedef struct {
+  bool enable;
+} sp_config_sloppy;
 
-typedef struct { bool enable; } sp_config_auto_cookie_secure;
+typedef struct {
+  bool enable;
+} sp_config_auto_cookie_secure;
 
-typedef struct { bool enable; } sp_config_disable_xxe;
+typedef struct {
+  bool enable;
+} sp_config_disable_xxe;
 
 typedef struct {
   enum samesite_type { strict = 1, lax = 2 } samesite;
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index 2e459a9..4a4f7d8 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -373,11 +373,8 @@ bool should_disable(zend_execute_data* execute_data,
     }
 
     if (config_node->r_value || config_node->value) {
-      if (check_is_builtin_name(config_node) &&
-          !config_node->var &&
-          !config_node->param &&
-          !config_node->r_param &&
-          !config_node->key &&
+      if (check_is_builtin_name(config_node) && !config_node->var &&
+          !config_node->param && !config_node->r_param && !config_node->key &&
           !config_node->r_key) {
         if (false == is_param_matching(execute_data, config_node, builtin_param,
                                        &arg_name, builtin_param_name,
@@ -422,8 +419,7 @@ bool should_drop_on_ret_ht(zval* return_value, const char* function_name,
 
   ht_entry = zend_hash_str_find_ptr(ht, function_name, strlen(function_name));
 
-  if (ht_entry &&
-      should_drop_on_ret(return_value, ht_entry, function_name)) {
+  if (ht_entry && should_drop_on_ret(return_value, ht_entry, function_name)) {
     ret = true;
   } else if (config && config->data) {
     ret = should_drop_on_ret(return_value, config, function_name);
diff --git a/src/sp_disabled_functions.h b/src/sp_disabled_functions.h
index 4e9f7ad..258e2e6 100644
--- a/src/sp_disabled_functions.h
+++ b/src/sp_disabled_functions.h
@@ -4,14 +4,14 @@
 extern zend_write_func_t zend_write_default;
 
 int hook_disabled_functions();
-int hook_echo(const char*, size_t);
+int hook_echo(const char *, size_t);
 bool should_disable(zend_execute_data *, const char *, const zend_string *,
                     const char *, const sp_list_node *, const zend_string *);
 bool should_disable_ht(zend_execute_data *, const char *, const zend_string *,
                        const char *, const sp_list_node *, const HashTable *);
-bool should_drop_on_ret_ht(zval *, const char *, const sp_list_node* config,
+bool should_drop_on_ret_ht(zval *, const char *, const sp_list_node *config,
                            const HashTable *);
-bool should_drop_on_ret(zval *, const sp_list_node* config, const char *);
-char* get_complete_function_path(zend_execute_data const* const);
+bool should_drop_on_ret(zval *, const sp_list_node *config, const char *);
+char *get_complete_function_path(zend_execute_data const *const);
 
 #endif /* __SP_DISABLE_FUNCTIONS_H */
diff --git a/src/sp_execute.c b/src/sp_execute.c
index 96d9d85..1c1672a 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -150,7 +150,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
   }
 
   if (SNUFFLEUPAGUS_G(config).hook_execute) {
-    char* function_name = get_complete_function_path(execute_data);
+    char *function_name = get_complete_function_path(execute_data);
 
     if (!function_name) {
       orig_execute_ex(execute_data);
diff --git a/src/sp_execute.h b/src/sp_execute.h
index d9eeee8..ce7f572 100644
--- a/src/sp_execute.h
+++ b/src/sp_execute.h
@@ -2,6 +2,6 @@
 #define SP_EXECUTE_H
 
 int hook_execute(void);
-zend_string *get_eval_filename(const char * const filename);
+zend_string *get_eval_filename(const char *const filename);
 
 #endif /* SP_EXECUTE_H */
diff --git a/src/sp_pcre_compat.h b/src/sp_pcre_compat.h
index 6658316..093a9c3 100644
--- a/src/sp_pcre_compat.h
+++ b/src/sp_pcre_compat.h
@@ -10,27 +10,28 @@
 /* We're not supporting pcre2 when it's not bundled with php7,
  * yet. Pull-requests are welcome. */
 #if HAVE_BUNDLED_PCRE
-  #if PHP_VERSION_ID >= 70300
-    #define SP_HAS_PCRE2
-    #include "ext/pcre/pcre2lib/pcre2.h"
-  #else
-    #include "ext/pcre/pcrelib/pcre.h"
-  #endif
+#if PHP_VERSION_ID >= 70300
+#define SP_HAS_PCRE2
+#include "ext/pcre/pcre2lib/pcre2.h"
 #else
- #include "pcre.h"
+#include "ext/pcre/pcrelib/pcre.h"
+#endif
+#else
+#include "pcre.h"
 #endif
 
 #ifdef SP_HAS_PCRE2
-  #define sp_pcre pcre2_code 
+#define sp_pcre pcre2_code
 #else
-  #define sp_pcre pcre
+#define sp_pcre pcre
 #endif
 
 sp_pcre* sp_pcre_compile(const char* str);
 #define sp_is_regexp_matching_zend(regexp, zstr) \
-        sp_is_regexp_matching_len(regexp, ZSTR_VAL(zstr), ZSTR_LEN(zstr))
+  sp_is_regexp_matching_len(regexp, ZSTR_VAL(zstr), ZSTR_LEN(zstr))
 #define sp_is_regexp_matching(regexp, str) \
-        sp_is_regexp_matching_len(regexp, str, strlen(str))
-bool sp_is_regexp_matching_len(const sp_pcre* regexp, const char* str, size_t len);
+  sp_is_regexp_matching_len(regexp, str, strlen(str))
+bool sp_is_regexp_matching_len(const sp_pcre* regexp, const char* str,
+                               size_t len);
 
-#endif // SP_PCRE_COMPAT_H
+#endif  // SP_PCRE_COMPAT_H
diff --git a/src/sp_session.h b/src/sp_session.h
index c2a0357..435e983 100644
--- a/src/sp_session.h
+++ b/src/sp_session.h
@@ -7,5 +7,4 @@
 #include "ext/hash/php_hash_sha.h"
 #include "ext/standard/base64.h"
 
-
 void hook_session();
diff --git a/src/sp_unserialize.c b/src/sp_unserialize.c
index 0f27255..9ed1c55 100644
--- a/src/sp_unserialize.c
+++ b/src/sp_unserialize.c
@@ -25,7 +25,8 @@ PHP_FUNCTION(sp_serialize) {
 
   size_t len = Z_STRLEN_P(return_value) + Z_STRLEN(hmac);
   if (len < Z_STRLEN_P(return_value)) {
-    sp_log_err("overflow_error", "Overflow tentative detected in sp_serialize.");
+    sp_log_err("overflow_error",
+               "Overflow tentative detected in sp_serialize.");
     sp_terminate();
   }
   zend_string *res = zend_string_alloc(len, 0);
diff --git a/src/sp_utils.c b/src/sp_utils.c
index 14b7c09..cdcf205 100644
--- a/src/sp_utils.c
+++ b/src/sp_utils.c
@@ -145,7 +145,8 @@ static char* zend_string_to_char(const zend_string* zs) {
   // Remove \0 from the middle of a string
 
   if (ZSTR_LEN(zs) + 1 < ZSTR_LEN(zs)) {
-    sp_log_err("overflow_error", "Overflow tentative detected in zend_string_to_char.");
+    sp_log_err("overflow_error",
+               "Overflow tentative detected in zend_string_to_char.");
     sp_terminate();
   }
   char* copy = emalloc(ZSTR_LEN(zs) + 1);
diff --git a/src/sp_utils.h b/src/sp_utils.h
index a21a4b0..7e1103c 100644
--- a/src/sp_utils.h
+++ b/src/sp_utils.h
@@ -44,20 +44,21 @@
 
 void sp_log_msg(char const *feature, char const *level, const char *fmt, ...);
 int compute_hash(const char *const filename, char *file_hash);
-const zend_string* sp_zval_to_zend_string(zval *);
+const zend_string *sp_zval_to_zend_string(zval *);
 bool sp_match_value(const zend_string *, const zend_string *, const sp_pcre *);
 bool sp_match_array_key(const zval *, const zend_string *, const sp_pcre *);
 bool sp_match_array_value(const zval *, const zend_string *, const sp_pcre *);
 void sp_log_disable(const char *restrict, const char *restrict,
                     const zend_string *restrict, const sp_disabled_function *,
-                    unsigned int, const char*restrict);
+                    unsigned int, const char *restrict);
 void sp_log_disable_ret(const char *restrict, const zend_string *restrict,
                         const sp_disabled_function *);
 int hook_function(const char *, HashTable *,
                   void (*)(INTERNAL_FUNCTION_PARAMETERS));
 int hook_regexp(const sp_pcre *, HashTable *,
                 void (*)(INTERNAL_FUNCTION_PARAMETERS));
-bool check_is_in_eval_whitelist(const zend_string * const function_name);
-int sp_log_request(const zend_string* folder, const zend_string* text_repr, char* from);
+bool check_is_in_eval_whitelist(const zend_string *const function_name);
+int sp_log_request(const zend_string *folder, const zend_string *text_repr,
+                   char *from);
 
 #endif /* SP_UTILS_H */
diff --git a/src/sp_var_value.c b/src/sp_var_value.c
index 9f656b7..268c3d1 100644
--- a/src/sp_var_value.c
+++ b/src/sp_var_value.c
@@ -142,7 +142,8 @@ static zval *get_object_property(zend_execute_data *ed, zval *object,
   if (!zvalue) {
     len = strlen(class_name) + 3 + strlen(property);
     char *private_property = emalloc(len);
-    snprintf(private_property, len, PRIVATE_PROP_FMT, 0, class_name, 0, property);
+    snprintf(private_property, len, PRIVATE_PROP_FMT, 0, class_name, 0,
+             property);
     zvalue = get_entry_hashtable(array, private_property, len - 1);
     efree(private_property);
   }