Changeset 8565a42 in mainline for uspace/app/wifi_supplicant

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

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

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -81 +81 @@
             addr->address[0], addr->address[1], addr->address[2],
             addr->address[3], addr->address[4], addr->address[5]);
-        
+
         if (rc < 0)
                 return NULL;
-        
+
         return str;
 }
@@ -96 +96 @@
                 return rc;
         }
-        
+
         rc = loc_category_get_svcs(wifi_cat, wifis, count);
         if (rc != EOK) {
@@ -102 +102 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -110 +110 @@
         service_id_t *wifis = NULL;
         size_t count;
-        
+
         errno_t rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
@@ -116 +116 @@
                 return NULL;
         }
-        
+
         if (i >= count) {
                 printf("Invalid wifi index.\n");
@@ -122 +122 @@
                 return NULL;
         }
-        
+
         async_sess_t *sess =
             loc_service_connect(wifis[i], INTERFACE_DDF, 0);
@@ -130 +130 @@
                 return NULL;
         }
-        
+
         return sess;
 }
@@ -138 +138 @@
         service_id_t *wifis = NULL;
         size_t count;
-        
+
         errno_t rc = get_wifi_list(&wifis, &count);
         if (rc != EOK) {
@@ -144 +144 @@
                 return EINVAL;
         }
-        
+
         printf("[Index]: [Service Name]\n");
         for (size_t i = 0; i < count; i++) {
@@ -154 +154 @@
                         return rc;
                 }
-                
+
                 printf("%zu: %s\n", i, svc_name);
-                
+
                 free(svc_name);
         }
-        
+
         return EOK;
 }
@@ -166 +166 @@
 {
         assert(ssid_start);
-        
+
         async_sess_t *sess = get_wifi_by_index(index);
         if (sess == NULL) {
@@ -173 +173 @@
                 return EINVAL;
         }
-        
+
         errno_t rc = ieee80211_disconnect(sess);
         if(rc != EOK) {
@@ -181 +181 @@
                         printf("Error when disconnecting device: %s\n",
                             str_error(rc));
-                
-                return rc;
-        }
-        
+
+                return rc;
+        }
+
         rc = ieee80211_connect(sess, ssid_start, password);
         if(rc != EOK) {
@@ -196 +196 @@
                         printf("Error when connecting to network: %s\n",
                             str_error(rc));
-                
-                return rc;
-        }
-        
+
+                return rc;
+        }
+
         // TODO: Wait for DHCP address?
-        
+
         printf("Successfully connected to network!\n");
-        
+
         return EOK;
 }
@@ -215 +215 @@
                 return EINVAL;
         }
-        
+
         errno_t rc = ieee80211_disconnect(sess);
         if (rc != EOK) {
@@ -225 +225 @@
                         printf("Error when disconnecting from network: %s\n",
                             str_error(rc));
-                
-                return rc;
-        }
-        
+
+                return rc;
+        }
+
         printf("Successfully disconnected.\n");
-        
+
         return EOK;
 }
@@ -242 +242 @@
                 return EINVAL;
         }
-        
+
         ieee80211_scan_results_t scan_results;
         errno_t rc = ieee80211_get_scan_results(sess, &scan_results, now);
@@ -251 +251 @@
                         printf("Failed to fetch scan results: %s\n",
                             str_error(rc));
-                
-                return rc;
-        }
-        
+
+                return rc;
+        }
+
         if (scan_results.length == 0)
                 return EOK;
-        
+
         printf("%16.16s %17s %4s %5s %5s %7s %7s\n",
             "SSID", "MAC", "CHAN", "TYPE", "AUTH", "UNI-ALG", "GRP-ALG");
-        
+
         for (uint8_t i = 0; i < scan_results.length; i++) {
                 ieee80211_scan_result_t result = scan_results.results[i];
-                
+
                 printf("%16.16s %17s %4d %5s %5s %7s %7s\n",
                     result.ssid, nic_addr_format(&result.bssid),
@@ -272 +272 @@
                     enum_name(ieee80211_security_alg_strs, result.security.group_alg));
         }
-        
+
         return EOK;
 }
@@ -284 +284 @@
                 return 1;
         }
-        
+
         rc = dhcp_init();
         if (rc != EOK) {
@@ -291 +291 @@
                 return 1;
         }
-        
+
         if (argc == 2) {
                 if (!str_cmp(argv[1], "list"))
@@ -303 +303 @@
                         return EINVAL;
                 }
-                
+
                 if (!str_cmp(argv[1], "scan")) {
                         bool now = false;
@@ -309 +309 @@
                                 if (!str_cmp(argv[3], "-n"))
                                         now = true;
-                        
+
                         return wifi_scan(index, now);
                 } else if (!str_cmp(argv[1], "connect")) {
@@ -316 +316 @@
                                 if (argc > 4)
                                         pass = argv[4];
-                                
+
                                 return wifi_connect(index, argv[3], pass);
                         }
@@ -322 +322 @@
                         return wifi_disconnect(index);
         }
-        
+
         print_syntax();
-        
+
         return EOK;
 }