gsupplicant: Remove dead assignment

[platform/upstream/connman.git] / gsupplicant / supplicant.c

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 58d40c1..977c0fb 100644 (file)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -742,6 +742,9 @@ unsigned int g_supplicant_interface_get_max_scan_ssids(
        if (interface == NULL)
                return 0;
 
+       if (interface->max_scan_ssids == 0)
+               return WPAS_MAX_SCAN_SSIDS;
+
        return interface->max_scan_ssids;
 }
 
@@ -2449,7 +2452,6 @@ static void interface_get_result(const char *error,
 
        if (error != NULL) {
                SUPPLICANT_DBG("Interface not created yet");
-               err = -EIO;
                goto create;
        }
 
@@ -2618,7 +2620,7 @@ static void interface_scan_result(const char *error,
        }
 
        if (data != NULL && data->scan_params != NULL)
-               g_free(data->scan_params);
+               g_supplicant_free_scan_params(data->scan_params);
 
        dbus_free(data);
 }
@@ -2643,7 +2645,7 @@ static void add_scan_frequencies(DBusMessageIter *iter,
        unsigned int freq;
        int i;
 
-       for (i = 0; i < G_SUPPLICANT_MAX_FAST_SCAN; i++) {
+       for (i = 0; i < scan_data->num_ssids; i++) {
                freq = scan_data->freqs[i];
                if (!freq)
                        break;
@@ -2668,11 +2670,13 @@ static void append_ssid(DBusMessageIter *iter,
 static void append_ssids(DBusMessageIter *iter, void *user_data)
 {
        GSupplicantScanParams *scan_data = user_data;
-       int i;
+       GSList *list;
 
-       for (i = 0; i < scan_data->num_ssids; i++)
-               append_ssid(iter, scan_data->ssids[i].ssid,
-                                       scan_data->ssids[i].ssid_len);
+       for (list = scan_data->ssids; list; list = list->next) {
+               struct scan_ssid *scan_ssid = list->data;
+
+               append_ssid(iter, scan_ssid->ssid, scan_ssid->ssid_len);
+       }
 }
 
 static void supplicant_add_scan_frequency(DBusMessageIter *dict,
@@ -2683,7 +2687,7 @@ static void supplicant_add_scan_frequency(DBusMessageIter *dict,
        DBusMessageIter entry, value, array;
        const char *key = "Channels";
 
-       if (scan_params->freqs[0] != 0) {
+       if (scan_params->freqs && scan_params->freqs[0] != 0) {
                dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
                                                NULL, &entry);
 
@@ -2961,9 +2965,8 @@ static void add_network_security_psk(DBusMessageIter *dict,
                                        GSupplicantSSID *ssid)
 {
        if (ssid->passphrase && strlen(ssid->passphrase) > 0) {
-
                if (is_psk_raw_key(ssid->passphrase) == TRUE)
-                       supplicant_dbus_property_append_fixed_array(dict,
+                       supplicant_dbus_dict_append_fixed_array(dict,
                                                        "psk", DBUS_TYPE_BYTE,
                                                        &ssid->passphrase, 64);
                else
@@ -3441,8 +3444,10 @@ static void interface_disconnect_result(const char *error,
        /* If we are disconnecting from previous WPS successful
         * association. i.e.: it did not went through AddNetwork,
         * and interface->network_path was never set. */
-       if (data->interface->network_path == NULL)
+       if (data->interface->network_path == NULL) {
+               dbus_free(data);
                return;
+       }
 
        network_remove(data);
 }