From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 12 09:15:08 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AAA56464 for ; Thu, 12 Sep 2013 09:15:08 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 339AF208A for ; Thu, 12 Sep 2013 09:15:07 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r8C9ExQd005826 for ; Thu, 12 Sep 2013 09:14:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r8C9Es4A004832 for freebsd-gecko@freebsd.org; Thu, 12 Sep 2013 09:14:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 12 Sep 2013 09:14:54 GMT Message-Id: <201309120914.r8C9Es4A004832@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1348 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 09:15:08 -0000 Author: jbeich Date: Thu Sep 12 09:14:53 2013 New Revision: 1348 Log: unbreak AP logging with DEBUG Suggested by: jhb Modified: trunk/mail/thunderbird/files/patch-bug893397 trunk/www/firefox-nightly/files/patch-bug893397 trunk/www/firefox/files/patch-bug893397 trunk/www/seamonkey/files/patch-bug893397 Modified: trunk/mail/thunderbird/files/patch-bug893397 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug893397 Sat Aug 31 21:10:42 2013 (r1347) +++ trunk/mail/thunderbird/files/patch-bug893397 Thu Sep 12 09:14:53 2013 (r1348) @@ -31,7 +31,7 @@ index 0000000..80d4cb6 --- /dev/null +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp -@@ -0,0 +1,173 @@ +@@ -0,0 +1,172 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -156,14 +156,13 @@ + accessPoints.AppendObject(ap); + res = true; + -+#if 0 + // log the data + LOG(( "FreeBSD access point: " -+ << "SSID: " << ssid << ", " -+ << "MAC: " << isr->isr_bssid << ", " -+ << "Strength: " << isr->isr_rssi ", " -+ << "Channel: " << isr->isr_freq << "MHz" )); -+#endif ++ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, " ++ "Strength: %d, Channel: %dMHz\n", ++ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2], ++ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5], ++ isr->isr_rssi, isr->isr_freq)); + + // increment pointers + len -= isr->isr_len; Modified: trunk/www/firefox-nightly/files/patch-bug893397 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug893397 Sat Aug 31 21:10:42 2013 (r1347) +++ trunk/www/firefox-nightly/files/patch-bug893397 Thu Sep 12 09:14:53 2013 (r1348) @@ -31,7 +31,7 @@ index 0000000..80d4cb6 --- /dev/null +++ netwerk/wifi/nsWifiScannerFreeBSD.cpp -@@ -0,0 +1,173 @@ +@@ -0,0 +1,172 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -156,14 +156,13 @@ + accessPoints.AppendObject(ap); + res = true; + -+#if 0 + // log the data + LOG(( "FreeBSD access point: " -+ << "SSID: " << ssid << ", " -+ << "MAC: " << isr->isr_bssid << ", " -+ << "Strength: " << isr->isr_rssi ", " -+ << "Channel: " << isr->isr_freq << "MHz" )); -+#endif ++ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, " ++ "Strength: %d, Channel: %dMHz\n", ++ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2], ++ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5], ++ isr->isr_rssi, isr->isr_freq)); + + // increment pointers + len -= isr->isr_len; Modified: trunk/www/firefox/files/patch-bug893397 ============================================================================== --- trunk/www/firefox/files/patch-bug893397 Sat Aug 31 21:10:42 2013 (r1347) +++ trunk/www/firefox/files/patch-bug893397 Thu Sep 12 09:14:53 2013 (r1348) @@ -31,7 +31,7 @@ index 0000000..80d4cb6 --- /dev/null +++ netwerk/wifi/nsWifiScannerFreeBSD.cpp -@@ -0,0 +1,173 @@ +@@ -0,0 +1,172 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -156,14 +156,13 @@ + accessPoints.AppendObject(ap); + res = true; + -+#if 0 + // log the data + LOG(( "FreeBSD access point: " -+ << "SSID: " << ssid << ", " -+ << "MAC: " << isr->isr_bssid << ", " -+ << "Strength: " << isr->isr_rssi ", " -+ << "Channel: " << isr->isr_freq << "MHz" )); -+#endif ++ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, " ++ "Strength: %d, Channel: %dMHz\n", ++ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2], ++ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5], ++ isr->isr_rssi, isr->isr_freq)); + + // increment pointers + len -= isr->isr_len; Modified: trunk/www/seamonkey/files/patch-bug893397 ============================================================================== --- trunk/www/seamonkey/files/patch-bug893397 Sat Aug 31 21:10:42 2013 (r1347) +++ trunk/www/seamonkey/files/patch-bug893397 Thu Sep 12 09:14:53 2013 (r1348) @@ -31,7 +31,7 @@ index 0000000..80d4cb6 --- /dev/null +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp -@@ -0,0 +1,173 @@ +@@ -0,0 +1,172 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -156,14 +156,13 @@ + accessPoints.AppendObject(ap); + res = true; + -+#if 0 + // log the data + LOG(( "FreeBSD access point: " -+ << "SSID: " << ssid << ", " -+ << "MAC: " << isr->isr_bssid << ", " -+ << "Strength: " << isr->isr_rssi ", " -+ << "Channel: " << isr->isr_freq << "MHz" )); -+#endif ++ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, " ++ "Strength: %d, Channel: %dMHz\n", ++ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2], ++ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5], ++ isr->isr_rssi, isr->isr_freq)); + + // increment pointers + len -= isr->isr_len;