X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_instance.c;h=89fdcfbc6a5b8a249e2b0ed977bcbd6c36471b02;hb=593828eb6109b2f0ee43f090d64a252f0ff92774;hp=0b71e15e1fdf897ba2a8e477533092c7ff3eebea;hpb=d03bbb38c5177de7ad4da2934980ebd9d119f287;p=collection4.git diff --git a/src/graph_instance.c b/src/graph_instance.c index 0b71e15..89fdcfb 100644 --- a/src/graph_instance.c +++ b/src/graph_instance.c @@ -433,6 +433,12 @@ int inst_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */ return (0); } /* }}} int inst_get_params */ +int inst_compare (const graph_instance_t *i0, /* {{{ */ + const graph_instance_t *i1) +{ + return (ident_compare (i0->select, i1->select)); +} /* }}} int inst_compare */ + int inst_compare_ident (graph_instance_t *inst, /* {{{ */ const graph_ident_t *ident) { @@ -532,6 +538,7 @@ int inst_describe (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */ char *buffer, size_t buffer_size) { graph_ident_t *cfg_select; + int status; if ((cfg == NULL) || (inst == NULL) || (buffer == NULL) || (buffer_size < 2)) @@ -544,31 +551,12 @@ int inst_describe (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */ return (-1); } - buffer[0] = 0; - -#define CHECK_FIELD(field) do { \ - if (IS_ANY (ident_get_##field (cfg_select))) \ - { \ - if (buffer[0] != 0) \ - strlcat (buffer, "/", buffer_size); \ - strlcat (buffer, ident_get_##field (inst->select), buffer_size); \ - } \ -} while (0) - - CHECK_FIELD (host); - CHECK_FIELD (plugin); - CHECK_FIELD (plugin_instance); - CHECK_FIELD (type); - CHECK_FIELD (type_instance); - -#undef CHECK_FIELD - - if (buffer[0] == 0) - strlcat (buffer, "default", buffer_size); + status = ident_describe (inst->select, cfg_select, + buffer, buffer_size); ident_destroy (cfg_select); - return (0); + return (status); } /* }}} int inst_describe */ time_t inst_get_mtime (graph_instance_t *inst) /* {{{ */