diff options
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch new file mode 100644 index 0000000000..cf4f4080a6 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From baf992f82aa987c608731866876adb856847ea45 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 May 2024 18:03:40 -0700 | ||
4 | Subject: [PATCH] relp: fix build against upcoming `gcc-14` | ||
5 | (`-Werror=calloc-transposed-args`) | ||
6 | |||
7 | `gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It | ||
8 | detected minor infelicity in `calloc()` API usage | ||
9 | |||
10 | Fixes | ||
11 | ../../git/src/relp.c: In function 'addToEpollSet': | ||
12 | ../../git/src/relp.c:101:39: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] | ||
13 | 101 | CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); | ||
14 | | ^~~~~~~~ | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/264] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/relp.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/relp.c b/src/relp.c | ||
23 | index eadda36..6268f1d 100644 | ||
24 | --- a/src/relp.c | ||
25 | +++ b/src/relp.c | ||
26 | @@ -98,7 +98,7 @@ addToEpollSet(relpEngine_t *const pThis, epolld_type_t typ, void *ptr, int sock, | ||
27 | epolld_t *epd = NULL; | ||
28 | ENTER_RELPFUNC; | ||
29 | |||
30 | - CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); | ||
31 | + CHKmalloc(epd = calloc(1, sizeof(epolld_t))); | ||
32 | epd->typ = typ; | ||
33 | epd->ptr = ptr; | ||
34 | epd->sock = sock; | ||
35 | -- | ||
36 | 2.45.0 | ||
37 | |||