projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lua: cleanup
[collectd.git]
/
src
/
match_regex.c
diff --git
a/src/match_regex.c
b/src/match_regex.c
index
dd4018b
..
4052ad5
100644
(file)
--- a/
src/match_regex.c
+++ b/
src/match_regex.c
@@
-33,9
+33,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "filter_chain.h"
#include "filter_chain.h"
-#include "meta_data.h"
+#include "utils/common/common.h"
+#include "utils/metadata/meta_data.h"
#include "utils_llist.h"
#include <regex.h>
#include "utils_llist.h"
#include <regex.h>
@@
-66,7
+66,7
@@
struct mr_match_s {
mr_regex_t *type;
mr_regex_t *type_instance;
llist_t *meta; /* Maps each meta key into mr_regex_t* */
mr_regex_t *type;
mr_regex_t *type_instance;
llist_t *meta; /* Maps each meta key into mr_regex_t* */
-
_B
ool invert;
+
b
ool invert;
};
/*
};
/*
@@
-151,7
+151,7
@@
static int mr_add_regex(mr_regex_t **re_head, const char *re_str, /* {{{ */
if (status != 0) {
char errmsg[1024];
regerror(status, &re->re, errmsg, sizeof(errmsg));
if (status != 0) {
char errmsg[1024];
regerror(status, &re->re, errmsg, sizeof(errmsg));
- errmsg[sizeof(errmsg) - 1] =
0
;
+ errmsg[sizeof(errmsg) - 1] =
'\0'
;
log_err("Compiling regex `%s' for `%s' failed: %s.", re->re_str, option,
errmsg);
sfree(re->re_str);
log_err("Compiling regex `%s' for `%s' failed: %s.", re->re_str, option,
errmsg);
sfree(re->re_str);
@@
-245,7
+245,7
@@
static int mr_create(const oconfig_item_t *ci, void **user_data) /* {{{ */
return -ENOMEM;
}
return -ENOMEM;
}
- m->invert =
0
;
+ m->invert =
false
;
status = 0;
for (int i = 0; i < ci->children_num; i++) {
status = 0;
for (int i = 0; i < ci->children_num; i++) {