[Guessnet-devel] [svn] r173 - in trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Sat Sep 23 14:44:53 2006
New Revision: 173

Modified:
   trunk/   (props changed)
   trunk/debian/changelog
   trunk/src/IFace.cc
Log:
 r442 at viaza:  enrico | 2006-09-23 15:42:06 +0100
 Correctly print link beat detection exceptions, and removed some throw() declarations


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sat Sep 23 14:44:53 2006
@@ -1,5 +1,6 @@
-guessnet (0.39-3) UNRELEASED; urgency=low
+guessnet (0.40-1) unstable; urgency=low
 
+ [Joachim Breitner <nomeata at debian.org>]
   * test-wireless makes wireless interface lose association (Closes:
     #329419)
     Until now, test-wireless ifconfig up'ed the interface and ifconfig down'ed
@@ -7,7 +8,16 @@
     lines. If it breaks it for you now, please tell us, so that we can
     implement a conditional ifconfig-up-and-down'ing.
 
- -- Joachim Breitner <nomeata at debian.org>  Thu,  7 Sep 2006 22:21:45 +0000
+ [Enrico Zini <enrico at debian.org>]
+  * New upstream version.
+    - Use the system classes from wibble 0.1.4+
+    - Fix the script line parser for the standalone configuration file.
+      Closes: bug#387601.
+    - Correctly prints wlan and priv link beat detection errors.
+      Closes: bug#387603.
+  * Added X-Vcs-Svn tag to debian/control
+
+ -- Enrico Zini <enrico at debian.org>  Sat, 23 Sep 2006 15:40:19 +0100
 
 guessnet (0.39-2) unstable; urgency=low
 

Modified: trunk/src/IFace.cc
==============================================================================
--- trunk/src/IFace.cc	(original)
+++ trunk/src/IFace.cc	Sat Sep 23 14:44:53 2006
@@ -85,7 +85,7 @@
 
 typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
 
-static interface_status_t interface_detect_beat_mii(int fd, const char *iface) throw (wibble::exception::MII)
+static interface_status_t interface_detect_beat_mii(int fd, const char *iface)
 {
     struct ifreq ifr;
     
@@ -103,7 +103,7 @@
     return (((unsigned short*) &ifr.ifr_data)[3] & 0x0016) == 0x0004 ? IFSTATUS_UP : IFSTATUS_DOWN;
 }
 
-static interface_status_t interface_detect_beat_priv(int fd, const char *iface) throw (wibble::exception::MII)
+static interface_status_t interface_detect_beat_priv(int fd, const char *iface)
 {
     struct ifreq ifr;
     
@@ -121,7 +121,7 @@
     return (((unsigned short*) &ifr.ifr_data)[3] & 0x0016) == 0x0004 ? IFSTATUS_UP : IFSTATUS_DOWN;
 }
 
-static interface_status_t interface_detect_beat_ethtool(int fd, const char *iface) throw (wibble::exception::MII)
+static interface_status_t interface_detect_beat_ethtool(int fd, const char *iface)
 {
     struct ifreq ifr;
     struct ethtool_value edata;
@@ -139,7 +139,7 @@
 }
 
 
-static int get_wlan_qual_old(const char *iface) throw (wibble::exception::MII)
+static int get_wlan_qual_old(const char *iface)
 {
     FILE *f;
     char buf[256];
@@ -182,7 +182,7 @@
     return q;
 }
 
-static int get_wlan_qual_new(int fd, const char *iface) throw (wibble::exception::MII)
+static int get_wlan_qual_new(int fd, const char *iface)
 {
     struct iwreq req;
     struct iw_statistics q;
@@ -232,7 +232,7 @@
     return !b || (mac[0] != 0xFF && mac[0] != 0x44 && mac[0] != 0x00);
 }
 
-static interface_status_t interface_detect_beat_wlan(int fd, const char *iface) throw (wibble::exception::MII)
+static interface_status_t interface_detect_beat_wlan(int fd, const char *iface)
 {
     uint8_t mac[6];
     int q;
@@ -256,7 +256,7 @@
     return q > 0 ? IFSTATUS_UP : IFSTATUS_DOWN;
 }
 
-static interface_status_t (*cached_detect_beat_func)(int, const char*) throw (wibble::exception::MII) = NULL;
+static interface_status_t (*cached_detect_beat_func)(int, const char*) = NULL;
 
 static interface_status_t detect_beat_auto(int fd, const char *iface)
 {
@@ -288,7 +288,7 @@
 		cached_detect_beat_func = interface_detect_beat_wlan;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (wlan) failed: %.*s\n", e.desc().c_str());
+		warning("Link beat detection (wlan) failed: %s\n", e.desc().c_str());
 	}
 
 	try {
@@ -296,7 +296,7 @@
 		cached_detect_beat_func = interface_detect_beat_priv;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (priv) failed: %.*s\n", e.desc().c_str());
+		warning("Link beat detection (priv) failed: %s\n", e.desc().c_str());
 	}
 
 	return IFSTATUS_ERR;