projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tree wide: Replace sstrerror() with STRERROR().
[collectd.git]
/
src
/
dbi.c
diff --git
a/src/dbi.c
b/src/dbi.c
index
7f3f207
..
62ef1dc
100644
(file)
--- a/
src/dbi.c
+++ b/
src/dbi.c
@@
-108,10
+108,10
@@
static const char *cdbi_strerror(dbi_conn conn, /* {{{ */
msg = NULL;
status = dbi_conn_error(conn, &msg);
if ((status >= 0) && (msg != NULL))
msg = NULL;
status = dbi_conn_error(conn, &msg);
if ((status >= 0) && (msg != NULL))
- s
s
nprintf(buffer, buffer_size, "%s (status %i)", msg, status);
+ snprintf(buffer, buffer_size, "%s (status %i)", msg, status);
else
else
- s
s
nprintf(buffer, buffer_size, "dbi_conn_error failed with status %i",
-
status);
+ snprintf(buffer, buffer_size, "dbi_conn_error failed with status %i",
+ status);
return buffer;
} /* }}} const char *cdbi_conn_error */
return buffer;
} /* }}} const char *cdbi_conn_error */
@@
-132,12
+132,12
@@
static int cdbi_result_get_field(dbi_result res, /* {{{ */
long long value;
value = dbi_result_get_longlong_idx(res, index);
long long value;
value = dbi_result_get_longlong_idx(res, index);
- s
s
nprintf(buffer, buffer_size, "%lli", value);
+ snprintf(buffer, buffer_size, "%lli", value);
} else if (src_type == DBI_TYPE_DECIMAL) {
double value;
value = dbi_result_get_double_idx(res, index);
} else if (src_type == DBI_TYPE_DECIMAL) {
double value;
value = dbi_result_get_double_idx(res, index);
- s
s
nprintf(buffer, buffer_size, "%63.15g", value);
+ snprintf(buffer, buffer_size, "%63.15g", value);
} else if (src_type == DBI_TYPE_STRING) {
const char *value;
} else if (src_type == DBI_TYPE_STRING) {
const char *value;
@@
-188,7
+188,10
@@
static void cdbi_database_free(cdbi_database_t *db) /* {{{ */
if (db->q_prep_areas)
for (size_t i = 0; i < db->queries_num; ++i)
udb_query_delete_preparation_area(db->q_prep_areas[i]);
if (db->q_prep_areas)
for (size_t i = 0; i < db->queries_num; ++i)
udb_query_delete_preparation_area(db->q_prep_areas[i]);
- free(db->q_prep_areas);
+ sfree(db->q_prep_areas);
+ /* N.B.: db->queries references objects "owned" by the global queries
+ * variable. Free the array here, but not the content. */
+ sfree(db->queries);
sfree(db);
} /* }}} void cdbi_database_free */
sfree(db);
} /* }}} void cdbi_database_free */