X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmatch_regex.c;h=20445cc196ab3c6b700e2da1738c948c9e228b4a;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=6b45f6c961b7d4fae42a38ccfc624420d6b45fbc;hpb=217ec252adf547f2dd048489e2498bc31e8f70db;p=collectd.git diff --git a/src/match_regex.c b/src/match_regex.c index 6b45f6c9..20445cc1 100644 --- a/src/match_regex.c +++ b/src/match_regex.c @@ -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* */ - _Bool invert; + bool 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)); - 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); @@ -224,7 +224,7 @@ static int mr_config_add_meta_regex(llist_t **meta, /* {{{ */ llist_append(*meta, entry); } - ssnprintf(buffer, sizeof(buffer), "%s `%s'", ci->key, meta_key); + snprintf(buffer, sizeof(buffer), "%s `%s'", ci->key, meta_key); /* Can't pass &entry->value into mr_add_regex, so copy in/out. */ re_head = entry->value; status = mr_add_regex(&re_head, ci->values[1].value.string, buffer); @@ -245,7 +245,7 @@ static int mr_create(const oconfig_item_t *ci, void **user_data) /* {{{ */ return -ENOMEM; } - m->invert = 0; + m->invert = false; status = 0; for (int i = 0; i < ci->children_num; i++) {