From: Tobias Oetiker <tobi@oetiker.ch>
Date: Wed, 14 Nov 2012 16:48:32 +0000 (+0100)
Subject: use skipscale everywhere and not SKIPSCALE
X-Git-Tag: 1.4.8~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1591fffceb3878b785c358e4d8d884f6ebe707ba;p=thirdparty%2Frrdtool-1.x.git

use skipscale everywhere and not SKIPSCALE
---

diff --git a/doc/rrdgraph_graph.pod b/doc/rrdgraph_graph.pod
index f138d104..1de245b8 100644
--- a/doc/rrdgraph_graph.pod
+++ b/doc/rrdgraph_graph.pod
@@ -16,9 +16,9 @@ B<VRULE>B<:>I<time>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[
 
 B<HRULE>B<:>I<value>B<#>I<color>[B<:>I<legend>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
-B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:SKIPSCALE>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
+B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:skipscale>][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
-B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:SKIPSCALE>]]
+B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:skipscale>]]
 
 B<TICK>B<:>I<vname>B<#>I<rrggbb>[I<aa>][B<:>I<fraction>[B<:>I<legend>]]
 
@@ -235,7 +235,7 @@ Draw a horizontal line at I<value>.  HRULE acts much like LINE except that
 will have no effect on the scale of the graph. If a HRULE is outside the
 graphing area it will just not be visible.
 
-=head3 B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:SKIPSCALE>]][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
+=head3 B<LINE>[I<width>]B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:skipscale>]][B<:dashes>[B<=>I<on_s>[,I<off_s>[,I<on_s>,I<off_s>]...]][B<:dash-offset=>I<offset>]]
 
 Draw a line of the specified width onto the graph. I<width> can be a
 floating point number. If the color is not specified, the drawing is done
@@ -249,7 +249,7 @@ B<AREA>.
 Normally the graphing function makes sure that the entire B<LINE> or B<AREA>
 is visible in the chart. The scaling of the chart will be modified
 accordingly if necessary. Any B<LINE> or B<AREA> can be excluded from this
-process by adding the option B<SKIPSCALE>.
+process by adding the option B<skipscale>.
 
 The B<dashes> modifier enables dashed line style. Without any further options
 a symmetric dashed line with a segment length of 5 pixels will be drawn. The
@@ -263,7 +263,7 @@ When you do not specify a color, you cannot specify a legend.  Should
 you want to use B<STACK>, use the "LINEx:<value>::STACK" form.
 
 
-=head3 B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:SKIPSCALE>]]
+=head3 B<AREA>B<:>I<value>[B<#>I<color>][B<:>[I<legend>][B<:STACK>][B<:skipscale>]]
 
 See B<LINE>, however the area between the x-axis and the line will
 be filled.
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index c0f61815..8de7ad59 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1290,7 +1290,7 @@ int data_proc(
                     /* GF_TICK: the data values are not
                      ** relevant for min and max
                      */
-                    if (finite(paintval) && im->gdes[ii].gf != GF_TICK && !im->gdes[ii].ignore_for_scaling) {
+                    if (finite(paintval) && im->gdes[ii].gf != GF_TICK && !im->gdes[ii].skipscale) {
                         if ((isnan(minval) || paintval < minval) &&
                             !(im->logarithmic && paintval <= 0.0))
                             minval = paintval;
@@ -3820,7 +3820,7 @@ int gdes_alloc(
     im->gdes[im->gdes_c - 1].step = im->step;
     im->gdes[im->gdes_c - 1].step_orig = im->step;
     im->gdes[im->gdes_c - 1].stack = 0;
-    im->gdes[im->gdes_c - 1].ignore_for_scaling = 0;
+    im->gdes[im->gdes_c - 1].skipscale = 0;
     im->gdes[im->gdes_c - 1].linewidth = 0;
     im->gdes[im->gdes_c - 1].debug = 0;
     im->gdes[im->gdes_c - 1].start = im->start;
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 7779de0c..82e78ed9 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -758,11 +758,11 @@ int rrd_parse_PVHLAST(
             dprintf("- not STACKing\n");
     }
 
-    dprintf("- parsing '%s', looking for SKIPSCALE\n", &line[*eaten]);
+    dprintf("- parsing '%s', looking for skipscale\n", &line[*eaten]);
     j = scan_for_col(&line[*eaten], 9, tmpstr);
-    if (!strcmp("SKIPSCALE", tmpstr)) {
-        dprintf("- found SKIPSCALE\n");
-        gdp->ignore_for_scaling = 1;
+    if (!strcmp("skipscale", tmpstr)) {
+        dprintf("- found skipscale\n");
+        gdp->skipscale = 1;
         (*eaten) += j;
         if (line[*eaten] == ':') {
             (*eaten) += 1;
@@ -770,8 +770,8 @@ int rrd_parse_PVHLAST(
             dprintf("- done parsing line\n");
             return 0;
         } else {
-            dprintf("- found %s instead of just SKIPSCALE\n", &line[*eaten]);
-            rrd_set_error("SKIPSCALE expected but %s found", &line[*eaten]);
+            dprintf("- found %s instead of just skipscale\n", &line[*eaten]);
+            rrd_set_error("skipscale expected but %s found", &line[*eaten]);
             return 1;
         }
     }