projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare for the release of rrdtool-1.2.10
[rrdtool.git]
/
src
/
rrd_graph_helper.c
diff --git
a/src/rrd_graph_helper.c
b/src/rrd_graph_helper.c
index
2e80741
..
0a5340f
100644
(file)
--- a/
src/rrd_graph_helper.c
+++ b/
src/rrd_graph_helper.c
@@
-1,5
+1,5
@@
/****************************************************************************
/****************************************************************************
- * RRDtool 1.2.
9
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.
10
Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
@@
-330,16
+330,28
@@
rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
tmpstr[j]='\0';
}
tmpstr[j]='\0';
}
+ /* Number or vname ?
+ * It is a number only if "k" equals either "j" or "i",
+ * depending on which is appropriate
+ */
dprintf("- examining value '%s'\n",tmpstr);
k=0;
if (gdp->gf == GF_VRULE) {
sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
dprintf("- examining value '%s'\n",tmpstr);
k=0;
if (gdp->gf == GF_VRULE) {
sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
- if (k) dprintf("- found time: %li\n",gdp->xrule);
+ if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+ dprintf("- found time: %li\n",gdp->xrule);
+ } else {
+ gdp->xrule=0; /* reset the value to "none" */
+ }
} else {
sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
} else {
sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
- if (k) dprintf("- found number: %f\n",gdp->yrule);
+ if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+ dprintf("- found number: %f\n",gdp->yrule);
+ } else {
+ gdp->yrule=DNAN; /* reset the value to "none" */
+ }
}
}
- if (
!k
) {
+ if (
((j!=0)&&(k!=j))||((j==0)&&(k!=i))
) {
if ((gdp->vidx=find_var(im,tmpstr))<0) {
rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
return 1;
if ((gdp->vidx=find_var(im,tmpstr))<0) {
rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
return 1;