Changes in uspace/app/wifi_supplicant/wifi_supplicant.c [1d6dd2a:38d150e] in mainline

File:

• uspace/app/wifi_supplicant/wifi_supplicant.c (modified) (15 diffs)

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
-#include <str_error.h>
 #include <loc.h>
 
@@ -88 +86 @@
 }
 
-static errno_t get_wifi_list(service_id_t **wifis, size_t *count)
+static int get_wifi_list(service_id_t **wifis, size_t *count)
 {
         category_id_t wifi_cat;
-        errno_t rc = loc_category_get_id("ieee80211", &wifi_cat, 0);
+        int rc = loc_category_get_id("ieee80211", &wifi_cat, 0);
         if (rc != EOK) {
                 printf("Error resolving category 'ieee80211'.\n");
@@ -111 +109 @@
         size_t count;
         
-        errno_t rc = get_wifi_list(&wifis, &count);
+        int rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
                 printf("Error fetching wifi list.\n");
@@ -134 +132 @@
 }
 
-static errno_t wifi_list(void)
+static int wifi_list(void)
 {
         service_id_t *wifis = NULL;
         size_t count;
         
-        errno_t rc = get_wifi_list(&wifis, &count);
-        if (rc != EOK) {
-                printf("Error fetching wifi list: %s\n", str_error(rc));
+        int rc = get_wifi_list(&wifis, &count);
+        if (rc != EOK) {
+                printf("Error fetching wifi list.\n");
                 return EINVAL;
         }
@@ -150 +148 @@
                 rc = loc_service_get_name(wifis[i], &svc_name);
                 if (rc != EOK) {
-                        printf("Error getting service name: %s\n", str_error(rc));
+                        printf("Error getting service name.\n");
                         free(wifis);
                         return rc;
@@ -163 +161 @@
 }
 
-static errno_t wifi_connect(uint32_t index, char *ssid_start, char *password)
+static int wifi_connect(uint32_t index, char *ssid_start, char *password)
 {
         assert(ssid_start);
@@ -174 +172 @@
         }
         
-        errno_t rc = ieee80211_disconnect(sess);
+        int rc = ieee80211_disconnect(sess);
         if(rc != EOK) {
                 if (rc == EREFUSED)
                         printf("Device is not ready yet.\n");
                 else
-                        printf("Error when disconnecting device: %s\n",
-                            str_error(rc));
+                        printf("Error when disconnecting device. "
+                            "Error: %d\n", rc);
                 
                 return rc;
@@ -194 +192 @@
                         printf("Given SSID not in scan results.\n");
                 else
-                        printf("Error when connecting to network: %s\n",
-                            str_error(rc));
+                        printf("Error when connecting to network. "
+                            "Error: %d\n", rc);
                 
                 return rc;
@@ -207 +205 @@
 }
 
-static errno_t wifi_disconnect(uint32_t index)
+static int wifi_disconnect(uint32_t index)
 {
         async_sess_t *sess = get_wifi_by_index(index);
@@ -216 +214 @@
         }
         
-        errno_t rc = ieee80211_disconnect(sess);
+        int rc = ieee80211_disconnect(sess);
         if (rc != EOK) {
                 if (rc == EREFUSED)
@@ -223 +221 @@
                         printf("Not connected to any WiFi network.\n");
                 else
-                        printf("Error when disconnecting from network: %s\n",
-                            str_error(rc));
+                        printf("Error when disconnecting from network. "
+                            "Error: %d\n", rc);
                 
                 return rc;
@@ -234 +232 @@
 }
 
-static errno_t wifi_scan(uint32_t index, bool now)
+static int wifi_scan(uint32_t index, bool now)
 {
         async_sess_t *sess = get_wifi_by_index(index);
@@ -244 +242 @@
         
         ieee80211_scan_results_t scan_results;
-        errno_t rc = ieee80211_get_scan_results(sess, &scan_results, now);
+        int rc = ieee80211_get_scan_results(sess, &scan_results, now);
         if (rc != EOK) {
                 if (rc == EREFUSED)
                         printf("Device is not ready yet.\n");
                 else
-                        printf("Failed to fetch scan results: %s\n",
-                            str_error(rc));
+                        printf("Failed to fetch scan results. Error: %d\n", rc);
                 
                 return rc;
@@ -278 +275 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc = inetcfg_init();
-        if (rc != EOK) {
-                printf("%s: Failed connecting to inetcfg service: %s.\n",
-                    NAME, str_error(rc));
+        int rc = inetcfg_init();
+        if (rc != EOK) {
+                printf("%s: Failed connecting to inetcfg service (%d).\n",
+                    NAME, rc);
                 return 1;
         }
@@ -287 +284 @@
         rc = dhcp_init();
         if (rc != EOK) {
-                printf("%s: Failed connecting to dhcp service: %s.\n",
-                    NAME, str_error(rc));
+                printf("%s: Failed connecting to dhcp service (%d).\n",
+                    NAME, rc);
                 return 1;
         }