projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon/types_list.c: fix minor style issue
[collectd.git]
/
src
/
daemon
/
types_list.c
diff --git
a/src/daemon/types_list.c
b/src/daemon/types_list.c
index
b1a7203
..
c3f590c
100644
(file)
--- a/
src/daemon/types_list.c
+++ b/
src/daemon/types_list.c
@@
-39,8
+39,8
@@
static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) {
int fields_num;
if (buf_len < 11) {
int fields_num;
if (buf_len < 11) {
- ERROR("parse_ds: (buf_len = %
zu
) < 11", buf_len);
- return
(-1)
;
+ ERROR("parse_ds: (buf_len = %
" PRIsz "
) < 11", buf_len);
+ return
-1
;
}
if (buf[buf_len - 1] == ',') {
}
if (buf[buf_len - 1] == ',') {
@@
-61,7
+61,7
@@
static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) {
if (fields_num != 4) {
ERROR("parse_ds: (fields_num = %i) != 4", fields_num);
if (fields_num != 4) {
ERROR("parse_ds: (fields_num = %i) != 4", fields_num);
- return
(-1)
;
+ return
-1
;
}
sstrncpy(dsrc->name, fields[0], sizeof(dsrc->name));
}
sstrncpy(dsrc->name, fields[0], sizeof(dsrc->name));
@@
-77,7
+77,7
@@
static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) {
else {
ERROR("(fields[1] = %s) != (GAUGE || COUNTER || DERIVE || ABSOLUTE)",
fields[1]);
else {
ERROR("(fields[1] = %s) != (GAUGE || COUNTER || DERIVE || ABSOLUTE)",
fields[1]);
- return
(-1)
;
+ return
-1
;
}
if (strcasecmp(fields[2], "U") == 0)
}
if (strcasecmp(fields[2], "U") == 0)
@@
-90,7
+90,7
@@
static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) {
else
dsrc->max = atof(fields[3]);
else
dsrc->max = atof(fields[3]);
- return
(0)
;
+ return
0
;
} /* int parse_ds */
static void parse_line(char *buf) {
} /* int parse_ds */
static void parse_line(char *buf) {
@@
-113,7
+113,7
@@
static void parse_line(char *buf) {
sstrncpy(ds->type, fields[0], sizeof(ds->type));
ds->ds_num = fields_num - 1;
sstrncpy(ds->type, fields[0], sizeof(ds->type));
ds->ds_num = fields_num - 1;
- ds->ds =
(data_source_t *)calloc(ds->ds_num, sizeof(data_source_t
));
+ ds->ds =
calloc(ds->ds_num, sizeof(*ds->ds
));
if (ds->ds == NULL) {
sfree(ds);
return;
if (ds->ds == NULL) {
sfree(ds);
return;
@@
-121,8
+121,8
@@
static void parse_line(char *buf) {
for (size_t i = 0; i < ds->ds_num; i++)
if (parse_ds(ds->ds + i, fields[i + 1], strlen(fields[i + 1])) != 0) {
for (size_t i = 0; i < ds->ds_num; i++)
if (parse_ds(ds->ds + i, fields[i + 1], strlen(fields[i + 1])) != 0) {
- ERROR("types_list: parse_line: Cannot parse data source #%
zu "
- "of data set %s",
+ ERROR("types_list: parse_line: Cannot parse data source #%
" PRIsz
+ "
of data set %s",
i, ds->type);
sfree(ds->ds);
sfree(ds);
i, ds->type);
sfree(ds->ds);
sfree(ds);
@@
-170,16
+170,14
@@
int read_types_list(const char *file) {
FILE *fh;
if (file == NULL)
FILE *fh;
if (file == NULL)
- return
(-1)
;
+ return
-1
;
fh = fopen(file, "r");
if (fh == NULL) {
fh = fopen(file, "r");
if (fh == NULL) {
- char errbuf[1024];
fprintf(stderr, "Failed to open types database `%s': %s.\n", file,
fprintf(stderr, "Failed to open types database `%s': %s.\n", file,
- sstrerror(errno, errbuf, sizeof(errbuf)));
- ERROR("Failed to open types database `%s': %s", file,
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ STRERRNO);
+ ERROR("Failed to open types database `%s': %s", file, STRERRNO);
+ return -1;
}
parse_file(fh);
}
parse_file(fh);
@@
-189,9
+187,5
@@
int read_types_list(const char *file) {
DEBUG("Done parsing `%s'", file);
DEBUG("Done parsing `%s'", file);
- return
(0)
;
+ return
0
;
} /* int read_types_list */
} /* int read_types_list */
-
-/*
- * vim: shiftwidth=2:softtabstop=2:tabstop=8
- */