[Madwifi-cvs] revision 4179 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 4179
Author      : proski (Pavel Roskin)
Date        : 2012-05-01 21:52:26 +0200 (Tue, 01 May 2012)

Log Message :
Use "%s" in err() calls to fix a warning on Ubuntu 10.04

err() would be confused if the interface name has formatting characters.

Affected Files:
* madwifi/trunk/tools/80211stats.c                    updated             
* madwifi/trunk/tools/athstats.c                      updated             


Modified: madwifi/trunk/tools/80211stats.c
===================================================================
--- madwifi/trunk/tools/80211stats.c	2012-01-30 19:56:17 UTC (rev 4178)
+++ madwifi/trunk/tools/80211stats.c	2012-05-01 19:52:26 UTC (rev 4179)
@@ -284,7 +284,7 @@
 		/* no args, just show global stats */
 		ifr.ifr_data = (caddr_t) &stats;
 		if (ioctl(s, SIOCG80211STATS, &ifr) < 0)
-			err(1, ifr.ifr_name);
+			err(1, "%s", ifr.ifr_name);
 		printstats(stdout, &stats);
 		return 0;
 	}

Modified: madwifi/trunk/tools/athstats.c
===================================================================
--- madwifi/trunk/tools/athstats.c	2012-01-30 19:56:17 UTC (rev 4178)
+++ madwifi/trunk/tools/athstats.c	2012-05-01 19:52:26 UTC (rev 4179)
@@ -285,9 +285,9 @@
 		if (line != 0) {
 			ifr.ifr_data = (caddr_t) &cur;
 			if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-				err(1, ifr.ifr_name);
+				err(1, "%s", ifr.ifr_name);
 			if (!getifstats(ifr.ifr_name, &icur, &ocur))
-				err(1, ifr.ifr_name);
+				err(1, "%s", ifr.ifr_name);
 			printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
 				(icur - itot) -
 					(cur.ast_rx_mgt - total.ast_rx_mgt),
@@ -307,9 +307,9 @@
 		} else {
 			ifr.ifr_data = (caddr_t) &total;
 			if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-				err(1, ifr.ifr_name);
+				err(1, "%s", ifr.ifr_name);
 			if (!getifstats(ifr.ifr_name, &itot, &otot))
-				err(1, ifr.ifr_name);
+				err(1, "%s", ifr.ifr_name);
 			printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
 				itot - total.ast_rx_mgt,
 				otot,
@@ -344,7 +344,7 @@
 
 		ifr.ifr_data = (caddr_t) &stats;
 		if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-			err(1, ifr.ifr_name);
+			err(1, "%s", ifr.ifr_name);
 		printstats(stdout, &stats);
 	}
 	return 0;