projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use true and false for assignments to bool
[collectd.git]
/
src
/
rrdcached.c
diff --git
a/src/rrdcached.c
b/src/rrdcached.c
index
4efb1f0
..
c09e048
100644
(file)
--- a/
src/rrdcached.c
+++ b/
src/rrdcached.c
@@
-39,8
+39,8
@@
*/
static char *datadir = NULL;
static char *daemon_address = NULL;
*/
static char *datadir = NULL;
static char *daemon_address = NULL;
-static
_Bool config_create_files = 1
;
-static
_Bool config_collect_stats = 1
;
+static
bool config_create_files = true
;
+static
bool config_collect_stats = true
;
static rrdcreate_config_t rrdcreate_config = {
/* stepsize = */ 0,
/* heartbeat = */ 0,
static rrdcreate_config_t rrdcreate_config = {
/* stepsize = */ 0,
/* heartbeat = */ 0,
@@
-75,7
+75,7
@@
static int value_list_to_string(char *buffer, int buffer_len,
memset(buffer, '\0', buffer_len);
t = CDTIME_T_TO_TIME_T(vl->time);
memset(buffer, '\0', buffer_len);
t = CDTIME_T_TO_TIME_T(vl->time);
- status = s
s
nprintf(buffer, buffer_len, "%lu", (unsigned long)t);
+ status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t);
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
if ((status < 1) || (status >= buffer_len))
return -1;
offset = status;
@@
-88,17
+88,17
@@
static int value_list_to_string(char *buffer, int buffer_len,
return -1;
if (ds->ds[i].type == DS_TYPE_COUNTER) {
return -1;
if (ds->ds[i].type == DS_TYPE_COUNTER) {
- status = s
snprintf(buffer + offset, buffer_len - offset, ":%llu"
,
-
vl->values[i].counter);
+ status = s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIu64
,
+
(uint64_t)
vl->values[i].counter);
} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%f",
-
vl->values[i].gauge);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%f",
+ vl->values[i].gauge);
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
-
vl->values[i].derive);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIi64,
+ vl->values[i].derive);
} else /* if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */ {
} else /* if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */ {
- status = s
s
nprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
-
vl->values[i].absolute);
+ status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64,
+ vl->values[i].absolute);
}
if ((status < 1) || (status >= (buffer_len - offset)))
}
if ((status < 1) || (status >= (buffer_len - offset)))
@@
-284,7
+284,7
@@
static int try_reconnect(void) {
static int rc_read(void) {
int status;
rrdc_stats_t *head;
static int rc_read(void) {
int status;
rrdc_stats_t *head;
-
_Bool retried = 0
;
+
bool retried = false
;
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = NAN};
value_list_t vl = VALUE_LIST_INIT;
vl.values = &(value_t){.gauge = NAN};
@@
-320,7
+320,7
@@
static int rc_read(void) {
break;
if (!retried) {
break;
if (!retried) {
- retried =
1
;
+ retried =
true
;
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */
@@
-392,7
+392,7
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
char values[512];
char *values_array[2];
int status;
char values[512];
char *values_array[2];
int status;
-
_Bool retried = 0
;
+
bool retried = false
;
if (daemon_address == NULL) {
ERROR("rrdcached plugin: daemon_address == NULL.");
if (daemon_address == NULL) {
ERROR("rrdcached plugin: daemon_address == NULL.");
@@
-424,9
+424,7
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
status = stat(filename, &statbuf);
if (status != 0) {
if (errno != ENOENT) {
status = stat(filename, &statbuf);
if (status != 0) {
if (errno != ENOENT) {
- char errbuf[1024];
- ERROR("rrdcached plugin: stat (%s) failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("rrdcached plugin: stat (%s) failed: %s", filename, STRERRNO);
return -1;
}
return -1;
}
@@
-457,7
+455,7
@@
static int rc_write(const data_set_t *ds, const value_list_t *vl,
break;
if (!retried) {
break;
if (!retried) {
- retried =
1
;
+ retried =
true
;
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */
@@
-476,15
+474,15
@@
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
__attribute__((unused)) user_data_t *ud) {
char filename[PATH_MAX + 1];
int status;
__attribute__((unused)) user_data_t *ud) {
char filename[PATH_MAX + 1];
int status;
-
_Bool retried = 0
;
+
bool retried = false
;
if (identifier == NULL)
return EINVAL;
if (datadir != NULL)
if (identifier == NULL)
return EINVAL;
if (datadir != NULL)
- s
s
nprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
+ snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier);
else
else
- s
s
nprintf(filename, sizeof(filename), "%s.rrd", identifier);
+ snprintf(filename, sizeof(filename), "%s.rrd", identifier);
rrd_clear_error();
status = rrdc_connect(daemon_address);
rrd_clear_error();
status = rrdc_connect(daemon_address);
@@
-504,7
+502,7
@@
static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */
break;
if (!retried) {
break;
if (!retried) {
- retried =
1
;
+ retried =
true
;
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */
if (try_reconnect() == 0)
continue;
/* else: report the error and fail */