graph_def_t *ret;
if ((cfg == NULL) || (ident == NULL) || (ds_name == NULL))
+ {
+ fprintf (stderr, "def_create: An argument is NULL\n");
return (NULL);
+ }
selector = graph_get_selector (cfg);
if (selector == NULL)
+ {
+ fprintf (stderr, "def_create: graph_get_selector failed\n");
return (NULL);
+ }
ret = malloc (sizeof (*ret));
if (ret == NULL)
{
+ fprintf (stderr, "def_create: malloc failed\n");
ident_destroy (selector);
return (NULL);
}
ret->ds_name = strdup (ds_name);
if (ret->ds_name == NULL)
{
+ fprintf (stderr, "def_create: Unable to copy DS name\n");
ident_destroy (selector);
free (ret);
return (NULL);
}
- ret->color = get_random_color ();
+ ret->color = UINT32_MAX;
ret->next = NULL;
ret->select = ident_copy_with_selector (selector, ident,
- IDENT_FLAG_REPLACE_ALL);
+ IDENT_FLAG_REPLACE_ANY);
if (ret->select == NULL)
{
+ fprintf (stderr, "def_create: ident_copy_with_selector failed\n");
ident_destroy (selector);
free (ret->ds_name);
free (ret);
char *file;
int index;
char draw_def[64];
+ char legend[256];
+ uint32_t color;
if ((def == NULL) || (ident == NULL) || (args == NULL))
return (EINVAL);
DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
+ if (def->legend != NULL)
+ {
+ strncpy (legend, def->legend, sizeof (legend));
+ legend[sizeof (legend) - 1] = 0;
+ }
+ else
+ {
+ ident_describe (ident, def->select,
+ legend, sizeof (legend));
+
+ if ((legend[0] == 0) || (strcmp ("default", legend) == 0))
+ {
+ strncpy (legend, def->ds_name, sizeof (legend));
+ legend[sizeof (legend) - 1] = 0;
+ }
+ }
+
+ color = def->color;
+ if (color > 0x00ffffff)
+ color = get_random_color ();
+
index = args->index;
args->index++;
if (def->area)
array_prepend_format (args->areas, "AREA:%s#%06"PRIx32,
- draw_def, fade_color (def->color));
+ draw_def, fade_color (color));
/* Graph part */
array_prepend_format (args->lines, "GPRINT:vdef_%04i_lst:%s last\\l",
array_prepend_format (args->lines, "GPRINT:vdef_%04i_min:%s min,",
index, (def->format != NULL) ? def->format : "%6.2lf");
array_prepend_format (args->lines, "LINE1:%s#%06"PRIx32":%s",
- draw_def, def->color,
- (def->legend != NULL) ? def->legend : def->ds_name);
+ draw_def, color, legend);
free (file);