| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From 5e600ae2ad370ddbb759e84ce55a7dfaa9a0bdd7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 3 | Date: Sun, 6 Sep 2020 14:17:23 +0200 |
| 4 | Subject: [PATCH] src/netlink.c: remove REG_NOERROR |
| 5 | |
| 6 | REG_NOERROR is used since version 5.12.0 and |
| 7 | https://github.com/collectd/collectd/commit/f7fd32e5209e188db7985a42054252fc4cbfe7c1 |
| 8 | |
| 9 | However, REG_NOERROR is not defined by musl, even GNU regex do not |
| 10 | mention REG_NOERROR, so just remove it to avoid the following build |
| 11 | failure: |
| 12 | |
| 13 | src/netlink.c: In function 'check_ignorelist': |
| 14 | src/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 | |
| 19 | Fixes: |
| 20 | - http://autobuild.buildroot.org/results/cd4d75888b5259b028132dd224be34f69bcbb702 |
| 21 | |
| 22 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 23 | --- |
| 24 | src/netlink.c | 2 +- |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 26 | |
| 27 | --- a/src/netlink.c |
| 28 | +++ b/src/netlink.c |
| 29 | @@ -240,7 +240,7 @@ static int check_ignorelist(const char * |
| 30 | for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) { |
| 31 | #if HAVE_REGEX_H |
| 32 | if (i->rdevice != NULL) { |
| 33 | - if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR) |
| 34 | + if (regexec(i->rdevice, dev, 0, NULL, 0)) |
| 35 | continue; |
| 36 | } else |
| 37 | #endif |