summaryrefslogtreecommitdiff
path: root/src/sp_list.c
diff options
context:
space:
mode:
authorChristian Göttsche2024-05-27 21:32:37 +0200
committerjvoisin2024-06-06 16:27:13 +0200
commit97836fae360422baf9c62dd0eb0de6e7b2cfab09 (patch)
tree99227ae43068915635b045ce2de8c26e1da2ac5f /src/sp_list.c
parentf8824a79ff69a2246a61e6381f0bc1e377e16a90 (diff)
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))) | ^~~~~
Diffstat (limited to 'src/sp_list.c')
-rw-r--r--src/sp_list.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp_list.c b/src/sp_list.c
index ab752f7..6a41fb4 100644
--- a/src/sp_list.c
+++ b/src/sp_list.c
@@ -53,7 +53,7 @@ sp_list_node *sp_list_sort(sp_list_node *pList,
53} 53}
54 54
55sp_list_node *sp_list_insert(sp_list_node *list, void *data) { 55sp_list_node *sp_list_insert(sp_list_node *list, void *data) {
56 sp_list_node *new = pecalloc(sizeof(*new), 1, 1); 56 sp_list_node *new = pecalloc(1, sizeof(*new), 1);
57 sp_list_node *origin = list; 57 sp_list_node *origin = list;
58 new->data = data; 58 new->data = data;
59 new->next = NULL; 59 new->next = NULL;
@@ -70,7 +70,7 @@ sp_list_node *sp_list_insert(sp_list_node *list, void *data) {
70} 70}
71 71
72sp_list_node *sp_list_prepend(sp_list_node *list, void *data) { 72sp_list_node *sp_list_prepend(sp_list_node *list, void *data) {
73 sp_list_node *new = pecalloc(sizeof(*new), 1, 1); 73 sp_list_node *new = pecalloc(1, sizeof(*new), 1);
74 new->next = list; 74 new->next = list;
75 new->data = data; 75 new->data = data;
76 return new; 76 return new;