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_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp_config.c')

diff --git a/src/sp_config.c b/src/sp_config.c
index 60c379a..2d2631a 100644
--- a/src/sp_config.c
+++ b/src/sp_config.c
@@ -217,7 +217,7 @@ SP_PARSEKW_FN(parse_cidr) {
   CHECK_DUPLICATE_KEYWORD(retval);
   SP_PARSE_ARG(value);
 
-  sp_cidr *cidr = pecalloc(sizeof(sp_cidr), 1, 1);
+  sp_cidr *cidr = pecalloc(1, sizeof(sp_cidr), 1);
 
   if (0 != get_ip_and_cidr(ZSTR_VAL(value), cidr)) {
     pefree(cidr, 1);
-- 
cgit v1.3