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.5' into collectd-5.6
[collectd.git]
/
src
/
utils_db_query.c
diff --git
a/src/utils_db_query.c
b/src/utils_db_query.c
index
26ebbf3
..
bbee90a
100644
(file)
--- a/
src/utils_db_query.c
+++ b/
src/utils_db_query.c
@@
-28,7
+28,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_db_query.h"
/*
#include "utils_db_query.h"
/*
@@
-199,7
+198,6
@@
static int udb_result_submit (udb_result_t *r, /* {{{ */
udb_query_t const *q, udb_query_preparation_area_t *q_area)
{
value_list_t vl = VALUE_LIST_INIT;
udb_query_t const *q, udb_query_preparation_area_t *q_area)
{
value_list_t vl = VALUE_LIST_INIT;
- int status;
assert (r != NULL);
assert (r_area->ds != NULL);
assert (r != NULL);
assert (r_area->ds != NULL);
@@
-256,15
+254,27
@@
static int udb_result_submit (udb_result_t *r, /* {{{ */
{
if (r->instance_prefix == NULL)
{
{
if (r->instance_prefix == NULL)
{
- strjoin (vl.type_instance, sizeof (vl.type_instance),
+
int status =
strjoin (vl.type_instance, sizeof (vl.type_instance),
r_area->instances_buffer, r->instances_num, "-");
r_area->instances_buffer, r->instances_num, "-");
+ if (status < 0)
+ {
+ ERROR ("udb_result_submit: creating type_instance failed with status %d.",
+ status);
+ return (status);
+ }
}
else
{
char tmp[DATA_MAX_NAME_LEN];
}
else
{
char tmp[DATA_MAX_NAME_LEN];
- strjoin (tmp, sizeof (tmp), r_area->instances_buffer,
+
int status =
strjoin (tmp, sizeof (tmp), r_area->instances_buffer,
r->instances_num, "-");
r->instances_num, "-");
+ if (status < 0)
+ {
+ ERROR ("udb_result_submit: creating type_instance failed with status %d.",
+ status);
+ return (status);
+ }
tmp[sizeof (tmp) - 1] = 0;
snprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s",
tmp[sizeof (tmp) - 1] = 0;
snprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s",
@@
-286,7
+296,7
@@
static int udb_result_submit (udb_result_t *r, /* {{{ */
for (size_t i = 0; i < r->metadata_num; i++)
{
for (size_t i = 0; i < r->metadata_num; i++)
{
- status = meta_data_add_string (vl.meta, r->metadata[i],
+
int
status = meta_data_add_string (vl.meta, r->metadata[i],
r_area->metadata_buffer[i]);
if (status != 0)
{
r_area->metadata_buffer[i]);
if (status != 0)
{