From 97836fae360422baf9c62dd0eb0de6e7b2cfab09 Mon Sep 17 00:00:00 2001
From: Christian Göttsche
Date: Mon, 27 May 2024 21:32:37 +0200
Subject: Reorder calloc(3) arguments

Please GCC:

    In file included from /usr/include/php/20220829/Zend/zend.h:30,
                     from /usr/include/php/20220829/main/php.h:31,
                     from /usr/include/php/20220829/main/SAPI.h:20,
                     from src/php_snuffleupagus.h:37,
                     from src/sp_ifilter.c:1:
    src/sp_pcre_compat.h: In function 'sp_regexp_compile':
    src/sp_pcre_compat.h:38:36: warning: '__zend_calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
       38 |   sp_regexp *ret = pecalloc(sizeof(sp_regexp), 1, 1);
          |                                    ^~~~~~~~~
    /usr/include/php/20220829/Zend/zend_alloc.h:199:72: note: in definition of macro 'pecalloc'
      199 | #define pecalloc(nmemb, size, persistent) ((persistent)?__zend_calloc((nmemb), (size)):ecalloc((nmemb), (size)))
          |                                                                        ^~~~~
    src/sp_pcre_compat.h:38:36: note: earlier argument should specify number of elements, later size of each element
       38 |   sp_regexp *ret = pecalloc(sizeof(sp_regexp), 1, 1);
          |                                    ^~~~~~~~~
    /usr/include/php/20220829/Zend/zend_alloc.h:199:72: note: in definition of macro 'pecalloc'
      199 | #define pecalloc(nmemb, size, persistent) ((persistent)?__zend_calloc((nmemb), (size)):ecalloc((nmemb), (size)))
          |                                                                        ^~~~~
---
 src/sp_var_parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp_var_parser.c')

diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c
index e7ff766..81d696f 100644
--- a/src/sp_var_parser.c
+++ b/src/sp_var_parser.c
@@ -7,7 +7,7 @@ static sp_list_node *parse_str_tokens(const char *str,
 
   while ((cur_str = strchr(cur_str, token.text_repr[0]))) {
     if (0 == strncmp(cur_str, token.text_repr, strlen(token.text_repr))) {
-      sp_conf_token *token_elm = pecalloc(sizeof(sp_conf_token), 1, 1);
+      sp_conf_token *token_elm = pecalloc(1, sizeof(sp_conf_token), 1);
       token_elm->pos = cur_str - str;
       token_elm->text_repr = token.text_repr;
       token_elm->type = token.type;
@@ -51,7 +51,7 @@ static int create_var(sp_tree *tree, const char *restrict value,
   if (tree->next == NULL && tree->type == UNDEFINED) {
     var_node = tree;
   } else {
-    var_node = pecalloc(sizeof(sp_tree), 1, 1);
+    var_node = pecalloc(1, sizeof(sp_tree), 1);
     free_node_on_error = true;
   }
 
-- 
cgit v1.3