char *plugin;
char *db_name;
- cdtime_t interval;
-
udb_result_preparation_area_t *result_prep_areas;
}; /* }}} */
}
}
- if (q_area->interval > 0)
- vl.interval = q_area->interval;
-
sstrncpy(vl.host, q_area->host, sizeof(vl.host));
sstrncpy(vl.plugin, q_area->plugin, sizeof(vl.plugin));
sstrncpy(vl.type, r->type, sizeof(vl.type));
status);
return status;
}
- tmp[sizeof(tmp) - 1] = 0;
+ tmp[sizeof(tmp) - 1] = '\0';
snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
r->instance_prefix, tmp);
}
}
- vl.type_instance[sizeof(vl.type_instance) - 1] = 0;
+ vl.type_instance[sizeof(vl.type_instance) - 1] = '\0';
/* }}} */
/* Annotate meta data. {{{ */
* r->instances_buffer, r->values_buffer, and r->metadata_buffer {{{ */
if (r->instances_num > 0) {
prep_area->instances_pos =
- (size_t *)calloc(r->instances_num, sizeof(size_t));
+ calloc(r->instances_num, sizeof(*prep_area->instances_pos));
if (prep_area->instances_pos == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
}
prep_area->instances_buffer =
- (char **)calloc(r->instances_num, sizeof(char *));
+ calloc(r->instances_num, sizeof(*prep_area->instances_buffer));
if (prep_area->instances_buffer == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
}
} /* if (r->instances_num > 0) */
- prep_area->values_pos = (size_t *)calloc(r->values_num, sizeof(size_t));
+ prep_area->values_pos = calloc(r->values_num, sizeof(*prep_area->values_pos));
if (prep_area->values_pos == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
}
- prep_area->values_buffer = (char **)calloc(r->values_num, sizeof(char *));
+ prep_area->values_buffer =
+ calloc(r->values_num, sizeof(*prep_area->values_buffer));
if (prep_area->values_buffer == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
}
- prep_area->metadata_pos = (size_t *)calloc(r->metadata_num, sizeof(size_t));
+ prep_area->metadata_pos =
+ calloc(r->metadata_num, sizeof(*prep_area->metadata_pos));
if (prep_area->metadata_pos == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
}
- prep_area->metadata_buffer = (char **)calloc(r->metadata_num, sizeof(char *));
+ prep_area->metadata_buffer =
+ calloc(r->metadata_num, sizeof(*prep_area->metadata_buffer));
if (prep_area->metadata_buffer == NULL) {
P_ERROR("udb_result_prepare_result: calloc failed.");
BAIL_OUT(-ENOMEM);
sfree(prep_area->plugin);
sfree(prep_area->db_name);
- prep_area->interval = 0;
-
for (r = q->results, r_area = prep_area->result_prep_areas; r != NULL;
r = r->next, r_area = r_area->next) {
/* this may happen during error conditions of the caller */
udb_query_preparation_area_t *prep_area,
const char *host, const char *plugin,
const char *db_name, char **column_names,
- size_t column_num, cdtime_t interval) {
+ size_t column_num) {
udb_result_preparation_area_t *r_area;
udb_result_t *r;
int status;
assert(prep_area->host == NULL);
assert(prep_area->plugin == NULL);
assert(prep_area->db_name == NULL);
- assert(prep_area->interval == 0);
#endif
prep_area->column_num = column_num;
prep_area->plugin = strdup(plugin);
prep_area->db_name = strdup(db_name);
- prep_area->interval = interval;
-
if ((prep_area->host == NULL) || (prep_area->plugin == NULL) ||
(prep_area->db_name == NULL)) {
P_ERROR("Query `%s': Prepare failed: Out of memory.", q->name);