xref: /OK3568_Linux_fs/buildroot/package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 5e600ae2ad370ddbb759e84ce55a7dfaa9a0bdd7 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sun, 6 Sep 2020 14:17:23 +0200
4Subject: [PATCH] src/netlink.c: remove REG_NOERROR
5
6REG_NOERROR is used since version 5.12.0 and
7https://github.com/collectd/collectd/commit/f7fd32e5209e188db7985a42054252fc4cbfe7c1
8
9However, REG_NOERROR is not defined by musl, even GNU regex do not
10mention REG_NOERROR, so just remove it to avoid the following build
11failure:
12
13src/netlink.c: In function 'check_ignorelist':
14src/netlink.c:243:51: error: 'REG_NOERROR' undeclared (first use in this function); did you mean 'REG_NOTBOL'?
15       if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
16                                                   ^~~~~~~~~~~
17                                                   REG_NOTBOL
18
19Fixes:
20 - http://autobuild.buildroot.org/results/cd4d75888b5259b028132dd224be34f69bcbb702
21
22Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
23[Upstream status: https://github.com/collectd/collectd/pull/3569]
24---
25 src/netlink.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/src/netlink.c b/src/netlink.c
29index 7a5da762..fac2fb1e 100644
30--- a/src/netlink.c
31+++ b/src/netlink.c
32@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type,
33   for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) {
34 #if HAVE_REGEX_H
35     if (i->rdevice != NULL) {
36-      if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
37+      if (regexec(i->rdevice, dev, 0, NULL, 0))
38         continue;
39     } else
40 #endif
41--
422.28.0
43
44