Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 13d6c9f190ea885fe63b7f8bd1cdddfb > files > 5

flow-tools-0.68-5mdv2009.0.src.rpm

diff -Naur flow-tools-0.68/lib/ftchash.c flow-tools-0.68.oden/lib/ftchash.c
--- flow-tools-0.68/lib/ftchash.c	2003-08-12 20:04:25.000000000 +0200
+++ flow-tools-0.68.oden/lib/ftchash.c	2005-09-09 16:47:19.000000000 +0200
@@ -326,7 +326,8 @@
       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
 
       ret = ftch->traverse_rec;
-      (char*)ftch->traverse_rec += ftch->d_size;
+      ftch->traverse_rec = (char*)ftch->traverse_rec + ftch->d_size;
+      
       return ret;
 
     } else {
diff -Naur flow-tools-0.68/lib/ftio.c flow-tools-0.68.oden/lib/ftio.c
--- flow-tools-0.68/lib/ftio.c	2003-02-24 01:51:47.000000000 +0100
+++ flow-tools-0.68.oden/lib/ftio.c	2005-09-09 16:47:19.000000000 +0200
@@ -2267,7 +2267,7 @@
         break;
 
       nleft -= nread;
-      (char*)ptr += nread;
+      ptr = (char*)ptr + nread;
   }
   return (nbytes - nleft);
 } /* readn */
@@ -2292,7 +2292,7 @@
       return(nwritten); /* error */
 
     nleft -= nwritten;
-    (char*)ptr += nwritten;
+    ptr = (char*)ptr + nwritten;
   }
   return(nbytes - nleft);
 } /* writen */
diff -Naur flow-tools-0.68/lib/fttlv.c flow-tools-0.68.oden/lib/fttlv.c
--- flow-tools-0.68/lib/fttlv.c	2003-02-13 03:38:43.000000000 +0100
+++ flow-tools-0.68.oden/lib/fttlv.c	2005-09-09 16:47:19.000000000 +0200
@@ -68,11 +68,11 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&v, buf, 4);
 
   return 8;
@@ -107,11 +107,11 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&v, buf, 2);
 
   return 6;
@@ -145,11 +145,11 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = (char*)buf + 2;
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&v, buf, 1);
 
   return 5;
@@ -183,10 +183,10 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
+  buf = (char*)buf + 2;
 
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
+  buf = (char*)buf + 2;
 
   bcopy(v, buf, len);
 
@@ -230,17 +230,17 @@
     return -1;
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&ifIndex, buf, 2);
-  (char*)buf += 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(name, buf, n);
 
   return 4+len2;
@@ -287,20 +287,20 @@
   }
 
   bcopy(&t, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+  
   bcopy(&len, buf, 2);
-  (char*)buf+= 2;
-
+  buf = (char*)buf + 2;
+	  
   bcopy(&ip, buf, 4);
-  (char*)buf += 4;
+  buf = (char*)buf + 2;
 
   bcopy(&entries, buf, 2);
-  (char*)buf += 2;
+  buf = (char*)buf + 2;
 
   bcopy(ifIndex_list, buf, esize);
-  (char*)buf += esize;
-
+  buf = (char*)buf + esize;
+  
   bcopy(name, buf, n);
 
   return 4+len2;