Changeset 84a1a54 in mainline for uspace/app

Timestamp:

2018-01-04T20:47:53Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

facacc71

Parents:

cde999a

Message:

Wrap returns of errno from main() with EXIT_RC().

Returns of error code from main() prevent type checking when errno_t
and int are considered incompatible. In order to avoid the philosophical
discussion of what should and shouldn't be returned for main(), we simply
wrap the error values and leave the answer to the question for future
generations to decide.

Location:

uspace/app

Files:

• bdsh/scli.c (modified) (1 diff)
• corecfg/corecfg.c (modified) (2 diffs)
• date/date.c (modified) (1 diff)
• dnscfg/dnscfg.c (modified) (1 diff)
• dnsres/dnsres.c (modified) (2 diffs)
• download/main.c (modified) (2 diffs)
• getterm/getterm.c (modified) (4 diffs)
• kio/kio.c (modified) (7 diffs)
• mkbd/main.c (modified) (6 diffs)
• nic/nic.c (modified) (2 diffs)
• sysinfo/sysinfo.c (modified) (3 diffs)
• sysinst/sysinst.c (modified) (1 diff)
• vuhid/main.c (modified) (1 diff)
• websrv/websrv.c (modified) (1 diff)
• wifi_supplicant/wifi_supplicant.c (modified) (4 diffs)

uspace/app/bdsh/scli.c

@@ -120 +120 @@
 
         cli_finit(&usr);
-        return ret;
+        return EXIT_RC(ret);
 }

uspace/app/corecfg/corecfg.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define NAME "corecfg"
@@ -76 +77 @@
                 return corecfg_print();
         else if (str_cmp(argv[1], "enable") == 0)
-                return corecfg_set_enable(true);
+                return EXIT_RC(corecfg_set_enable(true));
         else if (str_cmp(argv[1], "disable") == 0)
-                return corecfg_set_enable(false);
+                return EXIT_RC(corecfg_set_enable(false));
         else {
                 printf("%s: Unknown command '%s'.\n", NAME, argv[1]);

uspace/app/date/date.c

@@ -191 +191 @@
         free(svc_name);
         free(svc_ids);
-        return rc;
+        return EXIT_RC(rc);
 }
 

uspace/app/dnscfg/dnscfg.c

@@ -128 +128 @@
 {
         if ((argc < 2) || (str_cmp(argv[1], "get-ns") == 0))
-                return dnscfg_print();
+                return EXIT_RC(dnscfg_print());
         else if (str_cmp(argv[1], "set-ns") == 0)
-                return dnscfg_set_ns(argc - 2, argv + 2);
+                return EXIT_RC(dnscfg_set_ns(argc - 2, argv + 2));
         else if (str_cmp(argv[1], "unset-ns") == 0)
-                return dnscfg_unset_ns();
+                return EXIT_RC(dnscfg_unset_ns());
         else {
                 printf("%s: Unknown command '%s'.\n", NAME, argv[1]);

uspace/app/dnsres/dnsres.c

@@ -81 +81 @@
         if (rc != EOK) {
                 printf("%s: Error resolving '%s'.\n", NAME, hname);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -89 +89 @@
                 dnsr_hostinfo_destroy(hinfo);
                 printf("%s: Error formatting address.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/app/download/main.c

@@ -240 +240 @@
         if (ofile != NULL && fclose(ofile) != 0) {
                 printf("Error writing '%s'.\n", ofname);
-                return EIO;
-        }
-
-        return EOK;
+                return EXIT_RC(EIO);
+        }
+
+        return 0;
 error:
         free(buf);
@@ -252 +252 @@
         if (ofile != NULL)
                 fclose(ofile);
-        return rc;
+        return EXIT_RC(rc);
 }
 

uspace/app/getterm/getterm.c

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 #include <str_error.h>
@@ -137 +138 @@
                         printf("%s: Error waiting on %s (%s)\n", APP_NAME, term,
                             str_error(rc));
-                        return rc;
+                        return EXIT_RC(rc);
                 }
         }
@@ -174 +175 @@
                 printf("%s: Error spawning %s (%s)\n", APP_NAME, cmd,
                     str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -183 +184 @@
                 printf("%s: Error waiting for %s (%s)\n", APP_NAME, cmd,
                     str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/app/kio/kio.c

@@ -191 +191 @@
                 fprintf(stderr, "%s: Unable to get number of kio pages\n",
                     NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -199 +199 @@
                 fprintf(stderr, "%s: Unable to get kio physical address\n",
                     NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -209 +209 @@
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to map kio\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -217 +217 @@
                 fprintf(stderr, "%s: Unable to register kio notifications\n",
                     NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -224 +224 @@
                 fprintf(stderr, "%s: Unable to create consumer fibril\n",
                     NAME);
-                return ENOMEM;
+                return EXIT_RC(ENOMEM);
         }
         
@@ -230 +230 @@
         if (!input) {
                 fprintf(stderr, "%s: Could not create input\n", NAME);
-                return ENOMEM;
+                return EXIT_RC(ENOMEM);
         }
 
@@ -253 +253 @@
                 rc = EOK;
 
-        return EOK;
+        return EXIT_RC(rc);
 }
 

uspace/app/mkbd/main.c

@@ -222 +222 @@
                 printf("Device not found or not of USB kind: %s.\n",
                     str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -229 +229 @@
                 printf(NAME ": failed to connect to the device (handle %"
                        PRIun "): %s.\n", dev_handle, str_error(errno));
-                return errno;
+                return EXIT_RC(errno);
         }
         
@@ -239 +239 @@
                 printf(NAME ": failed to get path (handle %"
                        PRIun "): %s.\n", dev_handle, str_error(errno));
-                return ENOMEM;
+                return EXIT_RC(ENOMEM);
         }
         
@@ -250 +250 @@
                 printf("Failed to initialize report parser: %s\n",
                     str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -259 +259 @@
         if (rc != EOK) {
                 printf("Failed to get event length: %s.\n", str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -266 +266 @@
                 printf("Out of memory.\n");
                 // TODO: hangup phone?
-                return ENOMEM;
+                return EXIT_RC(ENOMEM);
         }
         

uspace/app/nic/nic.c

@@ -413 +413 @@
         async_sess_t *sess;
         nic_address_t addr;
-        int rc, idx;
+        int rc;
+        int idx;
 
         sess = get_nic_by_index(i);
@@ -543 +544 @@
 
                 if (!str_cmp(argv[2], "addr"))
-                        return nic_set_addr(index, argv[3]);
+                        return EXIT_RC(nic_set_addr(index, argv[3]));
 
                 if (!str_cmp(argv[2], "speed"))
-                        return nic_set_speed(index, argv[3]);
+                        return EXIT_RC(nic_set_speed(index, argv[3]));
 
                 if (!str_cmp(argv[2], "duplex"))
-                        return nic_set_duplex(index, argv[3]);
+                        return EXIT_RC(nic_set_duplex(index, argv[3]));
 
                 if (!str_cmp(argv[2], "auto"))
-                        return nic_set_autoneg(index);
+                        return EXIT_RC(nic_set_autoneg(index));
 
                 if (!str_cmp(argv[2], "unicast"))
-                        return nic_set_rx_unicast(index, argv[3]);
+                        return EXIT_RC(nic_set_rx_unicast(index, argv[3]));
 
                 if (!str_cmp(argv[2], "multicast"))
-                        return nic_set_rx_multicast(index, argv[3]);
+                        return EXIT_RC(nic_set_rx_multicast(index, argv[3]));
 
                 if (!str_cmp(argv[2], "broadcast"))
-                        return nic_set_rx_broadcast(index, argv[3]);
+                        return EXIT_RC(nic_set_rx_broadcast(index, argv[3]));
 
         } else {

uspace/app/sysinfo/sysinfo.c

@@ -90 +90 @@
         fputs("')\n", stdout);
         
-        return EOK;
+        return 0;
 }
 
@@ -109 +109 @@
         fputs("')\n", stdout);
         
-        return EOK;
+        return 0;
 }
 
@@ -182 +182 @@
                         break;
                 case SYSINFO_VAL_VAL:
-                        rc = print_item_val(ipath);
+                        rc = EXIT_RC(print_item_val(ipath));
                         break;
                 case SYSINFO_VAL_DATA:

uspace/app/sysinst/sysinst.c

@@ -387 +387 @@
 {
         const char *dev = DEFAULT_DEV;
-        return sysinst_install(dev);
+        return EXIT_RC(sysinst_install(dev));
 }
 

uspace/app/vuhid/main.c

@@ -238 +238 @@
                 printf("Unable to start communication with VHCD `%s': %s.\n",
                     controller, str_error(rc));
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/app/websrv/websrv.c

@@ -450 +450 @@
                         rc = parse_option(argc, argv, &i);
                         if (rc != EOK)
-                                return rc;
+                                return EXIT_RC(rc);
                 } else {
                         usage();
-                        return EINVAL;
+                        return EXIT_RC(EINVAL);
                 }
         }

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -293 +293 @@
         if (argc == 2) {
                 if (!str_cmp(argv[1], "list"))
-                        return wifi_list();
+                        return EXIT_RC(wifi_list());
         } else if (argc > 2) {
                 uint32_t index;
@@ -300 +300 @@
                         printf("%s: Invalid argument.\n", NAME);
                         print_syntax();
-                        return EINVAL;
+                        return EXIT_RC(EINVAL);
                 }
                 
@@ -309 +309 @@
                                         now = true;
                         
-                        return wifi_scan(index, now);
+                        return EXIT_RC(wifi_scan(index, now));
                 } else if (!str_cmp(argv[1], "connect")) {
                         char *pass = NULL;
@@ -316 +316 @@
                                         pass = argv[4];
                                 
-                                return wifi_connect(index, argv[3], pass);
+                                return EXIT_RC(wifi_connect(index, argv[3], pass));
                         }
                 } else if (!str_cmp(argv[1], "disconnect"))
-                        return wifi_disconnect(index);
+                        return EXIT_RC(wifi_disconnect(index));
         }
         
         print_syntax();
         
-        return EOK;
+        return 0;
 }