svn commit: trunk/busybox/networking/libiproute

aldot at busybox.net aldot at busybox.net
Thu Jan 12 13:15:50 UTC 2006


Author: aldot
Date: 2006-01-12 05:15:49 -0800 (Thu, 12 Jan 2006)
New Revision: 13258

Log:
- remove warning about redeclaration of __constant_htons
- remove warning about format '%ld' expects type 'long int *', but argument #num
  has type 'long unsigned int *'


Modified:
   trunk/busybox/networking/libiproute/iptunnel.c


Changeset:
Modified: trunk/busybox/networking/libiproute/iptunnel.c
===================================================================
--- trunk/busybox/networking/libiproute/iptunnel.c	2006-01-12 12:08:46 UTC (rev 13257)
+++ trunk/busybox/networking/libiproute/iptunnel.c	2006-01-12 13:15:49 UTC (rev 13258)
@@ -1,10 +1,7 @@
 /*
  * iptunnel.c	       "ip tunnel"
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Authors:	Alexey Kuznetsov, <kuznet at ms2.inr.ac.ru>
  *
@@ -31,7 +28,9 @@
 #include <net/if_arp.h>
 
 #include <asm/types.h>
+#ifndef __constant_htons
 #define __constant_htons htons
+#endif
 #include <linux/if_tunnel.h>
 
 #include "rt_names.h"
@@ -468,7 +467,7 @@
 			bb_error_msg("Wrong format of /proc/net/dev. Sorry.");
 			return -1;
 		}
-		if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
+		if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu",
 			   &rx_bytes, &rx_packets, &rx_errs, &rx_drops,
 			   &rx_fifo, &rx_frame, &rx_multi,
 			   &tx_bytes, &tx_packets, &tx_errs, &tx_drops,




More information about the busybox-cvs mailing list