diff --git a/src/core/store_json.c b/src/core/store_json.c
index f5be74543f32ed8bbee35b2cff6f95dba828d2e1..878cc4fe265886653c754a60a83ef23889af1668 100644 (file)
--- a/src/core/store_json.c
+++ b/src/core/store_json.c
*/
struct sdb_store_json_formatter {
+ sdb_object_t super;
+
+ /* The string buffer to write to */
sdb_strbuf_t *buf;
/* The context describes the state of the formatter through
int type;
int flags;
};
+#define F(obj) ((sdb_store_json_formatter_t *)(obj))
+
+static int
+formatter_init(sdb_object_t *obj, va_list ap)
+{
+ sdb_store_json_formatter_t *f = F(obj);
+
+ f->buf = va_arg(ap, sdb_strbuf_t *);
+ if (! f->buf)
+ return -1;
+
+ f->type = va_arg(ap, int);
+ if ((f->type != SDB_HOST) && (f->type != SDB_SERVICE) && (f->type != SDB_METRIC))
+ return -1;
+
+ f->flags = va_arg(ap, int);
+
+ f->context[0] = 0;
+ f->current = 0;
+
+ f->current_host = NULL;
+ return 0;
+} /* formatter_init */
+
+static sdb_type_t formatter_type = {
+ /* size = */ sizeof(sdb_store_json_formatter_t),
+ /* init = */ formatter_init,
+ /* destroy = */ NULL,
+};
/*
* private helper functions
if (obj->type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&ATTR(obj)->value) + 1];
char val[2 * sizeof(tmp) + 3];
- if (sdb_data_format(&ATTR(obj)->value, tmp, sizeof(tmp),
- SDB_DOUBLE_QUOTED) < 0)
+ if (! sdb_data_format(&ATTR(obj)->value, tmp, sizeof(tmp),
+ SDB_DOUBLE_QUOTED))
snprintf(tmp, sizeof(tmp), "<error>");
if (tmp[0] == '"') {
}
/* TODO: make time and interval formats configurable */
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", obj->last_update))
+ if (! sdb_strftime(time_str, sizeof(time_str), obj->last_update))
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
sdb_store_json_formatter_t *
sdb_store_json_formatter(sdb_strbuf_t *buf, int type, int flags)
{
- sdb_store_json_formatter_t *f;
-
- if (! buf)
- return NULL;
-
- if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC))
- return NULL;
-
- f = calloc(1, sizeof(*f));
- if (! f)
- return NULL;
-
- f->buf = buf;
- f->context[0] = 0;
- f->current = 0;
-
- f->current_host = NULL;
-
- f->type = type;
- f->flags = flags;
- return f;
+ return F(sdb_object_create("json-formatter", formatter_type,
+ buf, type, flags));
} /* sdb_store_json_formatter */
int