diff --git a/src/graph_ident.c b/src/graph_ident.c
index 119571f172487170ad844f4445b6160615325e9b..e7d193266e4d38622ff6ad35a659102cb605be50 100644 (file)
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
return (strdup (buffer));
} /* }}} char *ident_to_file */
-#define ADD_FIELD(field) do { \
- char json[1024]; \
- json_escape_copy (json, ident->field, sizeof (json)); \
- strlcat (buffer, json, sizeof (buffer)); \
+int ident_to_json (const graph_ident_t *ident, /* {{{ */
+ yajl_gen handler)
+{
+ yajl_gen_status status;
+
+ if ((ident == NULL) || (handler == NULL))
+ return (EINVAL);
+
+#define ADD_STRING(str) do { \
+ status = yajl_gen_string (handler, \
+ (unsigned char *) (str), \
+ (unsigned int) strlen (str)); \
+ if (status != yajl_gen_status_ok) \
+ return ((int) status); \
} while (0)
-char *ident_to_json (const graph_ident_t *ident) /* {{{ */
+ yajl_gen_map_open (handler);
+ ADD_STRING ("host");
+ ADD_STRING (ident->host);
+ ADD_STRING ("plugin");
+ ADD_STRING (ident->plugin);
+ ADD_STRING ("plugin_instance");
+ ADD_STRING (ident->plugin_instance);
+ ADD_STRING ("type");
+ ADD_STRING (ident->type);
+ ADD_STRING ("type_instance");
+ ADD_STRING (ident->type_instance);
+ yajl_gen_map_close (handler);
+
+#undef ADD_FIELD
+
+ return (0);
+} /* }}} char *ident_to_json */
+
+int ident_describe (const graph_ident_t *ident, /* {{{ */
+ const graph_ident_t *selector,
+ char *buffer, size_t buffer_size)
{
- char buffer[4096];
+ if ((ident == NULL) || (selector == NULL)
+ || (buffer == NULL) || (buffer_size < 2))
+ return (EINVAL);
buffer[0] = 0;
- strlcat (buffer, "{\"host\":\"", sizeof (buffer));
- ADD_FIELD (host);
- strlcat (buffer, "\",\"plugin\":\"", sizeof (buffer));
- ADD_FIELD (plugin);
- strlcat (buffer, "\",\"plugin_instance\":\"", sizeof (buffer));
- ADD_FIELD (plugin_instance);
- strlcat (buffer, "\",\"type\":\"", sizeof (buffer));
- ADD_FIELD (type);
- strlcat (buffer, "\",\"type_instance\":\"", sizeof (buffer));
- ADD_FIELD (type_instance);
- strlcat (buffer, "\"}", sizeof (buffer));
+#define CHECK_FIELD(field) do { \
+ if (strcasecmp (selector->field, ident->field) != 0) \
+ { \
+ if (buffer[0] != 0) \
+ strlcat (buffer, "/", buffer_size); \
+ strlcat (buffer, ident->field, buffer_size); \
+ } \
+} while (0)
- return (strdup (buffer));
-} /* }}} char *ident_to_json */
+ CHECK_FIELD (host);
+ CHECK_FIELD (plugin);
+ CHECK_FIELD (plugin_instance);
+ CHECK_FIELD (type);
+ CHECK_FIELD (type_instance);
-#undef ADD_FIELD
+#undef CHECK_FIELD
+
+ if (buffer[0] == 0)
+ strlcat (buffer, "default", buffer_size);
+
+ return (0);
+} /* }}} int ident_describe */
time_t ident_get_mtime (const graph_ident_t *ident) /* {{{ */
{