Merge branch 'search'

[collection4.git] / src / graph_def.c

diff --git a/src/graph_def.c b/src/graph_def.c
index b8e0ce4..cecc8f0 100644 (file)
--- a/src/graph_def.c
+++ b/src/graph_def.c
@@ -5,6 +5,7 @@
 #include "graph_def.h"
 #include "graph.h"
 #include "graph_config.h"
+#include "graph_ident.h"
 #include "common.h"
 #include "oconfig.h"
 
@@ -219,9 +220,6 @@ int def_config (graph_config_t *cfg, const oconfig_item_t *ci) /* {{{ */
       graph_config_get_bool (child, &def->area);
     else if (strcasecmp ("Format", child->key) == 0)
       graph_config_get_string (child, &def->format);
-    else
-      fprintf (stderr, "def_config: Ignoring unknown config option \"%s\"",
-          child->key);
   }
 
   return (graph_add_def (cfg, def));
@@ -332,13 +330,13 @@ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
       (def->legend != NULL) ? def->legend : def->ds_name,
       def->stack ? ":STACK" : "");
   array_append_format (args, "GPRINT:vdef_%04i_min:%s min,",
-      index, (def->format != NULL) ? def->format : "%lg");
+      index, (def->format != NULL) ? def->format : "%6.2lf");
   array_append_format (args, "GPRINT:vdef_%04i_avg:%s avg,",
-      index, (def->format != NULL) ? def->format : "%lg");
+      index, (def->format != NULL) ? def->format : "%6.2lf");
   array_append_format (args, "GPRINT:vdef_%04i_max:%s max,",
-      index, (def->format != NULL) ? def->format : "%lg");
+      index, (def->format != NULL) ? def->format : "%6.2lf");
   array_append_format (args, "GPRINT:vdef_%04i_lst:%s last\\l",
-      index, (def->format != NULL) ? def->format : "%lg");
+      index, (def->format != NULL) ? def->format : "%6.2lf");
 
   free (file);