projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7'
[collectd.git]
/
src
/
utils_tail_match.c
diff --git
a/src/utils_tail_match.c
b/src/utils_tail_match.c
index
1a99384
..
f046f6b
100644
(file)
--- a/
src/utils_tail_match.c
+++ b/
src/utils_tail_match.c
@@
-76,7
+76,7
@@
static int simple_submit_match(cu_match_t *match, void *user_data) {
match_value = (cu_match_value_t *)match_get_user_data(match);
if (match_value == NULL)
match_value = (cu_match_value_t *)match_get_user_data(match);
if (match_value == NULL)
- return
(-1)
;
+ return
-1
;
if ((match_value->ds_type & UTILS_MATCH_DS_TYPE_GAUGE) &&
(match_value->values_num == 0))
if ((match_value->ds_type & UTILS_MATCH_DS_TYPE_GAUGE) &&
(match_value->values_num == 0))
@@
-96,7
+96,7
@@
static int simple_submit_match(cu_match_t *match, void *user_data) {
plugin_dispatch_values(&vl);
match_value_reset(match_value);
plugin_dispatch_values(&vl);
match_value_reset(match_value);
- return
(0)
;
+ return
0
;
} /* int simple_submit_match */
static int latency_submit_match(cu_match_t *match, void *user_data) {
} /* int simple_submit_match */
static int latency_submit_match(cu_match_t *match, void *user_data) {
@@
-106,7
+106,7
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
match_value = (cu_match_value_t *)match_get_user_data(match);
if (match_value == NULL)
match_value = (cu_match_value_t *)match_get_user_data(match);
if (match_value == NULL)
- return
(-1)
;
+ return
-1
;
sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, data->plugin, sizeof(vl.plugin));
sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, data->plugin, sizeof(vl.plugin));
@@
-167,7
+167,7
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
match_value->values_num = 0;
latency_counter_reset(match_value->latency);
match_value->values_num = 0;
latency_counter_reset(match_value->latency);
- return
(0)
;
+ return
0
;
} /* int latency_submit_match */
static int tail_callback(void *data, char *buf,
} /* int latency_submit_match */
static int tail_callback(void *data, char *buf,
@@
-177,7
+177,7
@@
static int tail_callback(void *data, char *buf,
for (size_t i = 0; i < obj->matches_num; i++)
match_apply(obj->matches[i].match, buf);
for (size_t i = 0; i < obj->matches_num; i++)
match_apply(obj->matches[i].match, buf);
- return
(0)
;
+ return
0
;
} /* int tail_callback */
static void tail_match_simple_free(void *data) {
} /* int tail_callback */
static void tail_match_simple_free(void *data) {
@@
-194,15
+194,15
@@
cu_tail_match_t *tail_match_create(const char *filename) {
obj = calloc(1, sizeof(*obj));
if (obj == NULL)
obj = calloc(1, sizeof(*obj));
if (obj == NULL)
- return
(NULL)
;
+ return
NULL
;
obj->tail = cu_tail_create(filename);
if (obj->tail == NULL) {
sfree(obj);
obj->tail = cu_tail_create(filename);
if (obj->tail == NULL) {
sfree(obj);
- return
(NULL)
;
+ return
NULL
;
}
}
- return
(obj)
;
+ return
obj
;
} /* cu_tail_match_t *tail_match_create */
void tail_match_destroy(cu_tail_match_t *obj) {
} /* cu_tail_match_t *tail_match_create */
void tail_match_destroy(cu_tail_match_t *obj) {
@@
-240,7
+240,7
@@
int tail_match_add_match(cu_tail_match_t *obj, cu_match_t *match,
temp = realloc(obj->matches,
sizeof(cu_tail_match_match_t) * (obj->matches_num + 1));
if (temp == NULL)
temp = realloc(obj->matches,
sizeof(cu_tail_match_match_t) * (obj->matches_num + 1));
if (temp == NULL)
- return
(-1)
;
+ return
-1
;
obj->matches = temp;
obj->matches_num++;
obj->matches = temp;
obj->matches_num++;
@@
-254,7
+254,7
@@
int tail_match_add_match(cu_tail_match_t *obj, cu_match_t *match,
temp->submit = submit_match;
temp->free = free_user_data;
temp->submit = submit_match;
temp->free = free_user_data;
- return
(0)
;
+ return
0
;
} /* int tail_match_add_match */
int tail_match_add_match_simple(cu_tail_match_t *obj, const char *regex,
} /* int tail_match_add_match */
int tail_match_add_match_simple(cu_tail_match_t *obj, const char *regex,
@@
-269,12
+269,12
@@
int tail_match_add_match_simple(cu_tail_match_t *obj, const char *regex,
match = match_create_simple(regex, excluderegex, ds_type);
if (match == NULL)
match = match_create_simple(regex, excluderegex, ds_type);
if (match == NULL)
- return
(-1)
;
+ return
-1
;
user_data = calloc(1, sizeof(*user_data));
if (user_data == NULL) {
match_destroy(match);
user_data = calloc(1, sizeof(*user_data));
if (user_data == NULL) {
match_destroy(match);
- return
(-1)
;
+ return
-1
;
}
sstrncpy(user_data->plugin, plugin, sizeof(user_data->plugin));
}
sstrncpy(user_data->plugin, plugin, sizeof(user_data->plugin));
@@
-311,7
+311,7
@@
out:
match_destroy(match);
}
match_destroy(match);
}
- return
(status)
;
+ return
status
;
} /* int tail_match_add_match_simple */
int tail_match_read(cu_tail_match_t *obj) {
} /* int tail_match_add_match_simple */
int tail_match_read(cu_tail_match_t *obj) {
@@
-322,7
+322,7
@@
int tail_match_read(cu_tail_match_t *obj) {
(void *)obj);
if (status != 0) {
ERROR("tail_match: cu_tail_read failed.");
(void *)obj);
if (status != 0) {
ERROR("tail_match: cu_tail_read failed.");
- return
(status)
;
+ return
status
;
}
for (size_t i = 0; i < obj->matches_num; i++) {
}
for (size_t i = 0; i < obj->matches_num; i++) {
@@
-334,5
+334,5
@@
int tail_match_read(cu_tail_match_t *obj) {
(*lt_match->submit)(lt_match->match, lt_match->user_data);
}
(*lt_match->submit)(lt_match->match, lt_match->user_data);
}
- return
(0)
;
+ return
0
;
} /* int tail_match_read */
} /* int tail_match_read */