X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fmeta_data.c;h=08f682e96dac393b814caf6b901ca3a4ab0bdd40;hb=07ba05937aeaedd683656c3912040950dbf4a152;hp=502ca1086074ff1ab597b75a33a7dd1dec96b36a;hpb=307c875e5a78a2729fbbe1a588d232e9a129d75a;p=collectd.git diff --git a/src/daemon/meta_data.c b/src/daemon/meta_data.c index 502ca108..08f682e9 100644 --- a/src/daemon/meta_data.c +++ b/src/daemon/meta_data.c @@ -40,7 +40,7 @@ union meta_value_u { int64_t mv_signed_int; uint64_t mv_unsigned_int; double mv_double; - _Bool mv_boolean; + bool mv_boolean; }; typedef union meta_value_u meta_value_t; @@ -524,7 +524,7 @@ int meta_data_add_double(meta_data_t *md, /* {{{ */ } /* }}} int meta_data_add_double */ int meta_data_add_boolean(meta_data_t *md, /* {{{ */ - const char *key, _Bool value) { + const char *key, bool value) { meta_entry_t *e; if ((md == NULL) || (key == NULL)) @@ -661,7 +661,7 @@ int meta_data_get_double(meta_data_t *md, /* {{{ */ } /* }}} int meta_data_get_double */ int meta_data_get_boolean(meta_data_t *md, /* {{{ */ - const char *key, _Bool *value) { + const char *key, bool *value) { meta_entry_t *e; if ((md == NULL) || (key == NULL) || (value == NULL)) @@ -713,15 +713,15 @@ int meta_data_as_string(meta_data_t *md, /* {{{ */ actual = e->value.mv_string; break; case MD_TYPE_SIGNED_INT: - ssnprintf(buffer, sizeof(buffer), "%" PRIi64, e->value.mv_signed_int); + snprintf(buffer, sizeof(buffer), "%" PRIi64, e->value.mv_signed_int); actual = buffer; break; case MD_TYPE_UNSIGNED_INT: - ssnprintf(buffer, sizeof(buffer), "%" PRIu64, e->value.mv_unsigned_int); + snprintf(buffer, sizeof(buffer), "%" PRIu64, e->value.mv_unsigned_int); actual = buffer; break; case MD_TYPE_DOUBLE: - ssnprintf(buffer, sizeof(buffer), GAUGE_FORMAT, e->value.mv_double); + snprintf(buffer, sizeof(buffer), GAUGE_FORMAT, e->value.mv_double); actual = buffer; break; case MD_TYPE_BOOLEAN: @@ -737,7 +737,6 @@ int meta_data_as_string(meta_data_t *md, /* {{{ */ temp = md_strdup(actual); if (temp == NULL) { - pthread_mutex_unlock(&md->lock); ERROR("meta_data_as_string: md_strdup failed for key `%s'.", key); return -ENOMEM; }