Changeset 132ab5d1 in mainline for uspace/app/wifi_supplicant/wifi_supplicant.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -40 +40 @@
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <str_error.h>
 #include <loc.h>
 
@@ -138 +140 @@
         int rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
-                printf("Error fetching wifi list.\n");
+                printf("Error fetching wifi list: %s\n", str_error(rc));
                 return EINVAL;
         }
@@ -147 +149 @@
                 rc = loc_service_get_name(wifis[i], &svc_name);
                 if (rc != EOK) {
-                        printf("Error getting service name.\n");
+                        printf("Error getting service name: %s\n", str_error(rc));
                         free(wifis);
                         return rc;
@@ -176 +178 @@
                         printf("Device is not ready yet.\n");
                 else
-                        printf("Error when disconnecting device. "
-                            "Error: %d\n", rc);
+                        printf("Error when disconnecting device: %s\n",
+                            str_error(rc));
                 
                 return rc;
@@ -191 +193 @@
                         printf("Given SSID not in scan results.\n");
                 else
-                        printf("Error when connecting to network. "
-                            "Error: %d\n", rc);
+                        printf("Error when connecting to network: %s\n",
+                            str_error(rc));
                 
                 return rc;
@@ -220 +222 @@
                         printf("Not connected to any WiFi network.\n");
                 else
-                        printf("Error when disconnecting from network. "
-                            "Error: %d\n", rc);
+                        printf("Error when disconnecting from network: %s\n",
+                            str_error(rc));
                 
                 return rc;
@@ -246 +248 @@
                         printf("Device is not ready yet.\n");
                 else
-                        printf("Failed to fetch scan results. Error: %d\n", rc);
+                        printf("Failed to fetch scan results: %s\n",
+                            str_error(rc));
                 
                 return rc;
@@ -276 +279 @@
         int rc = inetcfg_init();
         if (rc != EOK) {
-                printf("%s: Failed connecting to inetcfg service (%d).\n",
-                    NAME, rc);
+                printf("%s: Failed connecting to inetcfg service: %s.\n",
+                    NAME, str_error(rc));
                 return 1;
         }
@@ -283 +286 @@
         rc = dhcp_init();
         if (rc != EOK) {
-                printf("%s: Failed connecting to dhcp service (%d).\n",
-                    NAME, rc);
+                printf("%s: Failed connecting to dhcp service: %s.\n",
+                    NAME, str_error(rc));
                 return 1;
         }