Revisions of net-tools

autobuild's avatar autobuild committed (revision 3)
checked in
Marcus Schaefer's avatar Marcus Schaefer (sax2) committed (revision 2)
- fixed data type of third argument in printval function.
  Also make sure the printf call in this function uses the
  correct format sequence (bnc #501113)

--This line, and those below, will be ignored--

A    net-tools-1.60-printval-conversion.patch
M    net-tools.changes
M    net-tools.spec

Diff for working copy: .
Index: net-tools.changes
===================================================================

--- net-tools.changes     (revision e058aa02196cd169750b5df8c3c65ca7) 
+++ net-tools.changes     (working copy) 
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May  7 10:05:09 CEST 2009 - ms@suse.de
+
+- fixed data type of third argument in printval function.
+  Also make sure the printf call in this function uses the
+  correct format sequence (bnc #501113)
+
 -------------------------------------------------------------------
 Wed Mar 25 16:23:29 CET 2009 - ms@suse.de
 

Index: net-tools.spec
===================================================================

--- net-tools.spec     (revision e058aa02196cd169750b5df8c3c65ca7) 
+++ net-tools.spec     (working copy) 
@@ -68,6 +68,7 @@
 Patch33:        net-tools-1.60-ifconfig-SIOCSIFNETMASK.diff 
 Patch34:        net-tools-1.60-interface_socket.diff
 Patch35:        net-tools-1.60-interface_mtu.diff
+Patch36:        net-tools-1.60-printval-conversion.patch
 
 %description
 This package contains essential programs for network administration and
@@ -121,6 +122,7 @@
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 %build
 make config

Index: net-tools-1.60-printval-conversion.patch
===================================================================

--- net-tools-1.60-printval-conversion.patch     (revision e058aa02196cd169750b5df8c3c65ca7) 
+++ net-tools-1.60-printval-conversion.patch     (working copy) 
@@ -1,0 +1,20 @@
+--- net-tools-1.60/statistics.c	2009-05-12 19:11:39.000000000 +0000
++++ net-tools-1.60/statistics.c	2009-05-12 19:12:26.000000000 +0000
+@@ -233,7 +233,7 @@
+     return strcmp(((struct entry *) a)->title, ((struct entry *) b)->title);
+ }
+ 
+-void printval(struct tabtab *tab, char *title, int val)
++void printval(struct tabtab *tab, char *title, signed long val)
+ {
+     struct entry *ent = NULL, key;
+     int type;
+@@ -244,7 +244,7 @@
+ 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
+ 			  sizeof(struct entry), cmpentries);
+     if (!ent) {			/* try our best */
+-	printf("%*s%s: %d\n", states[state].indent, "", title, val);
++	printf("%*s%s: %lu\n", states[state].indent, "", title, val);
+ 	return;
+     }
+     type = ent->type;
unknown committed (revision 1)
Displaying all 3 revisions
openSUSE Build Service is sponsored by