0001-src-netlink.c-remove-REG_NOERROR.patch 1.6 KB

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