a patch to avoid a memory leak and a Makefile.am patch to

[rrdtool.git] / src / rrd_diff.c

diff --git a/src/rrd_diff.c b/src/rrd_diff.c
index 1d0d1f5..3f80a15 100644 (file)
--- 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 <ollie@uk.clara.net>
+ *
+ * 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))