]> git.neil.brown.name Git - gsm0710muxd.git/commitdiff
Fix breakage caused by removal of attempt to close channels at shutdown.
authorNeil Brown <neilb@suse.de>
Sat, 31 Jan 2009 19:56:09 +0000 (06:56 +1100)
committerNeil Brown <neilb@suse.de>
Sat, 31 Jan 2009 19:56:09 +0000 (06:56 +1100)
commit 98a0c4c761f28ebc47e46b0760cc3dba2939da84
removed some code but left unused bits that cause warning.

So move the "int i" inside the "#if 0" and hide
dbus_signal_send_deactivate as well.

Signed-off-by: NeilBrown <neilb@suse.de>
src/gsm0710muxd.c

index b11cc39548f8d0abf2f7d3e91002f1144f955007..0e5b88ee4f758f4b0a92ce9abba9af4538a52db8 100644 (file)
@@ -805,6 +805,7 @@ static int dbus_deinit()
        return 0;
 }
 
+#if 0
 static int dbus_signal_send_deactivate(const char* sigvalue)
 {
        DBusConnection* conn = dbus_g_connection_get_connection(g_conn);
@@ -839,6 +840,7 @@ static int dbus_signal_send_deactivate(const char* sigvalue)
        dbus_message_unref(msg);
        return 0;
 }
+#endif
 
 /**
        GPtrArray *table = parse("(14-5),(3-7),(4-9),(33)");
@@ -1764,11 +1766,11 @@ static int close_devices()
        LOG(LOG_DEBUG, "Enter");
        g_source_remove(serial.g_source);
        serial.g_source = -1;
-       int i;
 // don't bother closing the channels over the MUX protocol, first off,
 // the mainloop is no longer running anyways, second, we're about to
 // shutdown the modem completely in a second.
 #if 0
+       int i;
        for (i=1;i<GSM0710_MAX_CHANNELS;i++)
        {
 //terminate command given. Close channels one by one and finaly close