added g as valid string format value

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@168 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/doc/rrdgraph-old.pod b/program/doc/rrdgraph-old.pod
index b464c4266408ba496dbc576dae382c2ae0b67beb..eb0456f979eef1b43f96298a85aea9bb693939c9 100644 (file)
--- a/program/doc/rrdgraph-old.pod
+++ b/program/doc/rrdgraph-old.pod
@@ -399,7 +399,7 @@ message but not a I<vname> fourtytwo that's always equal to 42.
 
 Calculate the chosen consolidation function I<CF> over the data-source
 variable I<vname> and C<printf> the result to stdout using I<format>.
-In the I<format> string there should be a '%lf' or '%le' marker in the
+In the I<format> string there should be a '%lf', '%le' or'%lg' marker in the
 place where the number should be printed.
 
 If an additional '%s' is found AFTER the marker, the value will be scaled

diff --git a/program/doc/rrdgraph_graph.src b/program/doc/rrdgraph_graph.src
index 5b163d40c908277368e6cc9d307fa66373451938..aa116f59df2e98f6a5c1b8fe24f48e7096c38789 100644 (file)
--- a/program/doc/rrdgraph_graph.src
+++ b/program/doc/rrdgraph_graph.src
@@ -85,15 +85,21 @@ B<%%> just prints a literal '%' character
 
 =item *
 
-B<%#.#le> (where # is an optional number) prints like 1.2346e+04
+B<%#.#le> prints like 1.2346e+04. Optional numbers # are field width and
+decimal precision
 
 =item *
 
-B<%#.#lf> prints like 12345.6789
+B<%#.#lf> prints like 12345.6789, with optional field width and precision
 
 =item *
 
-B<%s> place this after B<%le> or B<%lf>.  This will be replaced by the
+B<%#.#lg> prints like 12345.6789, with optional field width and number of
+significant digits
+
+=item *
+
+B<%s> place this after B<%le>, B<%lf> or B<%lg>. This will be replaced by the
 appropriate SI magnitude unit and the value will be scaled
 accordingly (123456 -> 123.456 k)
 

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 8d21d707380eafccd64473b7e634a396d4b22123..b8952250d1b46f4ce2151ef36acf075bc4014606 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -3064,9 +3064,9 @@ int bad_format(char *fmt) {
                  if (*ptr == '.') ptr++;
                  while (*ptr >= '0' && *ptr <= '9') ptr++;
   
-                 /* Either 'le' or 'lf' must follow here */
+                 /* Either 'le', 'lf' or 'lg' must follow here */
                  if (*ptr++ != 'l') return 1;
-                 if (*ptr == 'e' || *ptr == 'f') ptr++;
+                 if (*ptr == 'e' || *ptr == 'f' || *ptr == 'g') ptr++;
                  else return 1;
                  n++;
             }