projects
/
collection4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b57ecd4
)
src/graph_def.c: Use "ident_describe" to generate a legend entry …
author
Florian Forster
<ff@octo.it>
Wed, 14 Jul 2010 15:01:33 +0000
(17:01 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Wed, 14 Jul 2010 15:01:33 +0000
(17:01 +0200)
… if no legend has been specified. Using the DS name here isn't as good
since often many files of the same type are grouped together.
src/graph_def.c
patch
|
blob
|
history
diff --git
a/src/graph_def.c
b/src/graph_def.c
index
bcef8cf
..
1f78ddd
100644
(file)
--- a/
src/graph_def.c
+++ b/
src/graph_def.c
@@
-315,6
+315,7
@@
int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
char *file;
int index;
char draw_def[64];
char *file;
int index;
char draw_def[64];
+ char legend[256];
if ((def == NULL) || (ident == NULL) || (args == NULL))
return (EINVAL);
if ((def == NULL) || (ident == NULL) || (args == NULL))
return (EINVAL);
@@
-328,6
+329,23
@@
int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
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;
+ }
+ }
+
index = args->index;
args->index++;
index = args->index;
args->index++;
@@
-380,8
+398,7
@@
int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
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",
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, def->color, legend);
free (file);
free (file);