X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_diff.c;h=3f80a156bd4f2694f83b38d6c0b186328ca54456;hb=ed9474147fcf5bace60fd36b5c3ca3b4f1f8ac53;hp=1d0d1f54f2ff9f0619ee22e3343a8ed3f1b14075;hpb=5837606887a6d81e8b1f7588525cb1c8783fb62b;p=rrdtool.git diff --git a/src/rrd_diff.c b/src/rrd_diff.c index 1d0d1f5..3f80a15 100644 --- a/src/rrd_diff.c +++ b/src/rrd_diff.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1999 + * RRDtool 1.1.x Copyright Tobias Oetiker, 1999 * This code is stolen from rateup (mrtg-2.x) by Dave Rand ***************************************************************************** * diff calculate the difference between two very long integers available as @@ -7,8 +7,15 @@ ***************************************************************************** * $Id$ * $Log$ - * Revision 1.1 2001/02/25 22:25:05 oetiker - * Initial revision + * Revision 1.3 2002/04/01 18:31:22 oetiker + * "!" takes a higher preference than "||" this means rrd_update N:: would + * segfault -- Oliver Cook + * + * Revision 1.2 2002/02/01 20:34:49 oetiker + * fixed version number and date/time + * + * Revision 1.1.1.1 2001/02/25 22:25:05 oetiker + * checkin * * Revision 1.1 1998/10/08 18:21:45 oetiker * Initial revision @@ -32,13 +39,13 @@ rrd_diff(char *a, char *b) char res[LAST_DS_LEN+1], *a1, *b1, *r1, *fix; int c,x,m; - while (!isdigit((int)*a) || *a==0) + while (!(isdigit((int)*a) || *a==0)) a++; fix=a; while (isdigit((int)*fix)) fix++; *fix = 0; /* maybe there is some non digit data in the string */ - while (!isdigit((int)*b) || *b==0) + while (!(isdigit((int)*b) || *b==0)) b++; fix=b; while (isdigit((int)*fix))