From c6145ebf927bb4be899b71df630522d0cfdde6ba Mon Sep 17 00:00:00 2001 From: Julien Thomas Date: Tue, 25 Jun 2013 13:22:40 +0200 Subject: [PATCH] Allow empty imginfo string format Commit 37d3050 "Added imginfo format check" breaks -f "" which used to be very usefull to print data as text format on stdout. Allowing an empty -f was particularly interesting because there was no x printed out. Before : [root@nagios-2b ~]# rrdtool graph /dev/null -f "" --start -1d \ DEF:d=/var/lib/rrd/nagios-2b/load.rrd:load5:AVERAGE \ VDEF:v=d,AVERAGE \ PRINT:v:%.6lf 5.284605 After : [root@nagios-2b ~]# rrdtool graph /dev/null -f "" --start -1d \ DEF:d=/var/lib/rrd/nagios-2b/load.rrd:load5:AVERAGE \ VDEF:v=d,AVERAGE \ PRINT:v:%.6lf ERROR: bad format for imginfo --- src/rrd_graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rrd_graph.c b/src/rrd_graph.c index e714e4f4..4d91793a 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -4139,7 +4139,7 @@ rrd_info_t *rrd_graph_v( ** Also, if needed, print a line with information about the image. */ - if (im.imginfo) { + if (im.imginfo && *im.imginfo) { rrd_infoval_t info; char *path; char *filename; -- 2.47.2