projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'make distcheck' (for `master-aggregation` hook)
[collectd.git]
/
src
/
utils_vl_lookup_test.c
diff --git
a/src/utils_vl_lookup_test.c
b/src/utils_vl_lookup_test.c
index
776a520
..
27bfddf
100644
(file)
--- a/
src/utils_vl_lookup_test.c
+++ b/
src/utils_vl_lookup_test.c
@@
-29,8
+29,8
@@
#include "testing.h"
#include "utils_vl_lookup.h"
#include "testing.h"
#include "utils_vl_lookup.h"
-static
_Bool expect_new_obj = 0
;
-static
_Bool have_new_obj = 0
;
+static
bool expect_new_obj
;
+static
bool have_new_obj
;
static lookup_identifier_t last_class_ident;
static lookup_identifier_t last_obj_ident;
static lookup_identifier_t last_class_ident;
static lookup_identifier_t last_obj_ident;
@@
-53,9
+53,9
@@
static int lookup_obj_callback(data_set_t const *ds, value_list_t const *vl,
memcpy(&last_obj_ident, obj, sizeof(last_obj_ident));
if (strcmp(obj->plugin_instance, "failure") == 0)
memcpy(&last_obj_ident, obj, sizeof(last_obj_ident));
if (strcmp(obj->plugin_instance, "failure") == 0)
- return
(-1)
;
+ return
-1
;
- return
(0)
;
+ return
0
;
}
static void *lookup_class_callback(data_set_t const *ds, value_list_t const *vl,
}
static void *lookup_class_callback(data_set_t const *ds, value_list_t const *vl,
@@
-75,9
+75,9
@@
static void *lookup_class_callback(data_set_t const *ds, value_list_t const *vl,
strncpy(obj->type, vl->type, sizeof(obj->type));
strncpy(obj->type_instance, vl->type_instance, sizeof(obj->type_instance));
strncpy(obj->type, vl->type, sizeof(obj->type));
strncpy(obj->type_instance, vl->type_instance, sizeof(obj->type_instance));
- have_new_obj =
1
;
+ have_new_obj =
true
;
- return (
(void *)obj)
;
+ return (
void *)obj
;
}
static int checked_lookup_add(lookup_t *obj, /* {{{ */
}
static int checked_lookup_add(lookup_t *obj, /* {{{ */
@@
-105,7
+105,7
@@
static int checked_lookup_add(lookup_t *obj, /* {{{ */
static int checked_lookup_search(lookup_t *obj, char const *host,
char const *plugin,
char const *plugin_instance, char const *type,
static int checked_lookup_search(lookup_t *obj, char const *host,
char const *plugin,
char const *plugin_instance, char const *type,
- char const *type_instance,
_B
ool expect_new) {
+ char const *type_instance,
b
ool expect_new) {
int status;
value_list_t vl = VALUE_LIST_INIT;
data_set_t const *ds = &ds_unknown;
int status;
value_list_t vl = VALUE_LIST_INIT;
data_set_t const *ds = &ds_unknown;
@@
-120,10
+120,10
@@
static int checked_lookup_search(lookup_t *obj, char const *host,
ds = &ds_test;
expect_new_obj = expect_new;
ds = &ds_test;
expect_new_obj = expect_new;
- have_new_obj =
0
;
+ have_new_obj =
false
;
status = lookup_search(obj, ds, &vl);
status = lookup_search(obj, ds, &vl);
- return
(status)
;
+ return
status
;
}
DEF_TEST(group_by_specific_host) {
}
DEF_TEST(group_by_specific_host) {
@@
-142,7
+142,7
@@
DEF_TEST(group_by_specific_host) {
/* expect new = */ 0);
lookup_destroy(obj);
/* expect new = */ 0);
lookup_destroy(obj);
- return
(0)
;
+ return
0
;
}
DEF_TEST(group_by_any_host) {
}
DEF_TEST(group_by_any_host) {
@@
-170,7
+170,7
@@
DEF_TEST(group_by_any_host) {
/* expect new = */ 0);
lookup_destroy(obj);
/* expect new = */ 0);
lookup_destroy(obj);
- return
(0)
;
+ return
0
;
}
DEF_TEST(multiple_lookups) {
}
DEF_TEST(multiple_lookups) {
@@
-198,7
+198,7
@@
DEF_TEST(multiple_lookups) {
assert(status == 2);
lookup_destroy(obj);
assert(status == 2);
lookup_destroy(obj);
- return
(0)
;
+ return
0
;
}
DEF_TEST(regex) {
}
DEF_TEST(regex) {
@@
-228,7
+228,7
@@
DEF_TEST(regex) {
/* expect new = */ 1);
lookup_destroy(obj);
/* expect new = */ 1);
lookup_destroy(obj);
- return
(0)
;
+ return
0
;
}
int main(int argc, char **argv) /* {{{ */
}
int main(int argc, char **argv) /* {{{ */