X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fpostgresql.c;h=41ce95cdf08b15f34cb7067d05a477c69c6a37da;hb=26c9dd08034c325d8a20ab80e9fba3d2c164f933;hp=6cf563181ab662099fe4f7a75ab76f257fec532e;hpb=f14bb45d570e0b34bdd3a2a0cadfe414c3dfda40;p=collectd.git diff --git a/src/postgresql.c b/src/postgresql.c index 6cf56318..41ce95cd 100644 --- a/src/postgresql.c +++ b/src/postgresql.c @@ -40,10 +40,6 @@ #include "utils_db_query.h" #include "utils_complain.h" -#if HAVE_PTHREAD_H -# include -#endif - #include #include @@ -224,7 +220,7 @@ static c_psql_database_t *c_psql_database_new (const char *name) return NULL; } - tmp = (c_psql_database_t **)realloc (databases, + tmp = realloc (databases, (databases_num + 1) * sizeof (*databases)); if (NULL == tmp) { log_err ("Out of memory."); @@ -555,7 +551,7 @@ static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q, log_err ("calloc failed."); BAIL_OUT (-1); } - + for (col = 0; col < column_num; ++col) { /* Pointers returned by `PQfname' are freed by `PQclear' via * `BAIL_OUT'. */ @@ -867,7 +863,7 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl, #undef VALUE_OR_NULL if( db->expire_delay > 0 && vl->time < (cdtime() - vl->interval - db->expire_delay) ) { - log_info ("c_psql_write: Skipped expired value @ %s - %s/%s-%s/%s-%s/%s", + log_info ("c_psql_write: Skipped expired value @ %s - %s/%s-%s/%s-%s/%s", params[0], params[1], params[2], params[3], params[4], params[5], params[6] ); return 0; } @@ -1115,7 +1111,7 @@ static int config_add_writer (oconfig_item_t *ci, if (strcasecmp (name, src_writers[i].name) != 0) continue; - tmp = (c_psql_writer_t **)realloc (*dst_writers, + tmp = realloc (*dst_writers, sizeof (**dst_writers) * (*dst_writers_num + 1)); if (tmp == NULL) { log_err ("Out of memory."); @@ -1151,7 +1147,7 @@ static int c_psql_config_writer (oconfig_item_t *ci) return 1; } - tmp = (c_psql_writer_t *)realloc (writers, + tmp = realloc (writers, sizeof (*writers) * (writers_num + 1)); if (tmp == NULL) { log_err ("Out of memory.");