TDLS: Declare tdls_testing as extern in a header file

[mech_eap.git] / wpa_supplicant / dbus / dbus_common.c

diff --git a/wpa_supplicant/dbus/dbus_common.c b/wpa_supplicant/dbus/dbus_common.c
index 245d62e..7ef6cad 100644 (file)
--- a/wpa_supplicant/dbus/dbus_common.c
+++ b/wpa_supplicant/dbus/dbus_common.c
@@ -165,6 +165,7 @@ static void process_timeout(void *eloop_ctx, void *sock_ctx)
 static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
 {
        struct wpas_dbus_priv *priv = data;
+
        if (!dbus_timeout_get_enabled(timeout))
                return TRUE;
 
@@ -180,6 +181,7 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
 static void remove_timeout(DBusTimeout *timeout, void *data)
 {
        struct wpas_dbus_priv *priv = data;
+
        eloop_cancel_timeout(process_timeout, priv, timeout);
        dbus_timeout_set_data(timeout, NULL, NULL);
 }
@@ -244,8 +246,7 @@ static int integrate_with_eloop(struct wpas_dbus_priv *priv)
                                                   remove_timeout,
                                                   timeout_toggled, priv,
                                                   NULL)) {
-               wpa_printf(MSG_ERROR, "dbus: Failed to set callback "
-                          "functions");
+               wpa_printf(MSG_ERROR, "dbus: Failed to set callback functions");
                return -1;
        }
 
@@ -259,12 +260,12 @@ static int integrate_with_eloop(struct wpas_dbus_priv *priv)
 
 
 static DBusHandlerResult disconnect_filter(DBusConnection *conn,
-                                           DBusMessage *message, void *data)
+                                          DBusMessage *message, void *data)
 {
        struct wpas_dbus_priv *priv = data;
 
        if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
-                                  "Disconnected")) {
+                                  "Disconnected")) {
                wpa_printf(MSG_DEBUG, "dbus: bus disconnected, terminating");
                dbus_connection_set_exit_on_disconnect(conn, FALSE);
                wpa_supplicant_terminate_proc(priv->global);
@@ -284,10 +285,11 @@ static int wpas_dbus_init_common(struct wpas_dbus_priv *priv)
        priv->con = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
        if (priv->con) {
                dbus_connection_add_filter(priv->con, disconnect_filter, priv,
-                                          NULL);
+                                          NULL);
        } else {
-               wpa_printf(MSG_ERROR, "dbus: Could not acquire the system "
-                          "bus: %s - %s", error.name, error.message);
+               wpa_printf(MSG_ERROR,
+                          "dbus: Could not acquire the system bus: %s - %s",
+                          error.name, error.message);
                ret = -1;
        }
        dbus_error_free(&error);
@@ -309,7 +311,7 @@ static int wpas_dbus_init_common_finish(struct wpas_dbus_priv *priv)
         * FIXME: is there a better solution to this problem?
         */
        eloop_register_timeout(0, 50, dispatch_initial_dbus_messages,
-                              priv->con, NULL);
+                              priv->con, NULL);
 
        return 0;
 }