[maemo-commits] [maemo-commits] r10987 - in projects/connectivity/osso-gwconnect/trunk: . debian src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-04-10 11:04:38 +0300 (Tue, 10 Apr 2007)
New Revision: 10987

Modified:
   projects/connectivity/osso-gwconnect/trunk/configure.ac
   projects/connectivity/osso-gwconnect/trunk/debian/changelog
   projects/connectivity/osso-gwconnect/trunk/src/devlist.c
Log:
Avoid shadowing global "clock" variable

Modified: projects/connectivity/osso-gwconnect/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/configure.ac	2007-04-10 07:48:23 UTC (rev 10986)
+++ projects/connectivity/osso-gwconnect/trunk/configure.ac	2007-04-10 08:04:38 UTC (rev 10987)
@@ -1,4 +1,4 @@
-AC_INIT([osso-gwconnect],[1.0.9])
+AC_INIT([osso-gwconnect],[1.0.10])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-gwconnect/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/debian/changelog	2007-04-10 07:48:23 UTC (rev 10986)
+++ projects/connectivity/osso-gwconnect/trunk/debian/changelog	2007-04-10 08:04:38 UTC (rev 10987)
@@ -1,3 +1,9 @@
+osso-gwconnect (1.0.10) unstable; urgency=low
+
+  * src/devlist.c: avoid shadowing global "clock" variable. 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 10 Apr 2007 11:03:36 +0300
+
 osso-gwconnect (1.0.9) unstable; urgency=low
 
   * Fix rfcomm_status parameter order on disconnect. Fixes: NB#53642

Modified: projects/connectivity/osso-gwconnect/trunk/src/devlist.c
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/src/devlist.c	2007-04-10 07:48:23 UTC (rev 10986)
+++ projects/connectivity/osso-gwconnect/trunk/src/devlist.c	2007-04-10 08:04:38 UTC (rev 10987)
@@ -82,7 +82,7 @@
 {
     DBusMessage *signal;
     uint8_t *cls = dev->cls;
-    uint32_t clock = (uint32_t)dev->clock;
+    uint32_t clk = (uint32_t)dev->clock;
 
     debug("Found: BDA=%s, name=%s, class=0x%02x%02x%02x, rssi=0x%02x, clock=0x%04X",
             dev->bda, dev->name,
@@ -103,7 +103,7 @@
                      DBUS_TYPE_STRING, &dev->name,
                      DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &cls, 3,
                      DBUS_TYPE_BYTE, &dev->rssi,
-                     DBUS_TYPE_UINT32, &clock,
+                     DBUS_TYPE_UINT32, &clk,
                      DBUS_TYPE_INVALID);
 
     return send_and_unref(connection, signal);