Changeset 84a1a54 in mainline for uspace/srv/hid

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/srv/hid

Files:

• compositor/compositor.c (modified) (3 diffs)
• input/input.c (modified) (2 diffs)
• isdv4_tablet/main.c (modified) (2 diffs)
• output/output.c (modified) (2 diffs)
• remcons/remcons.c (modified) (3 diffs)
• rfb/main.c (modified) (2 diffs)
• s3c24xx_ts/s3c24xx_ts.c (modified) (3 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -2254 +2254 @@
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
-                return -1;
+                return rc;
         }
         
@@ -2272 +2272 @@
         char winreg[LOC_NAME_MAXLEN + 1];
         snprintf(winreg, LOC_NAME_MAXLEN, "%s%s/winreg", NAMESPACE, server_name);
-        if (loc_service_register(winreg, &winreg_id) != EOK) {
+        rc = loc_service_register(winreg, &winreg_id);
+        if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, winreg);
-                return -1;
+                return rc;
         }
         
@@ -2315 +2316 @@
         int rc = compositor_srv_init(argv[1], argv[2]);
         if (rc != EOK)
-                return rc;
+                return EXIT_RC(rc);
         
         printf("%s: Accepting connections\n", NAME);

uspace/srv/hid/input/input.c

@@ -869 +869 @@
         if (rc != EOK) {
                 printf("%s: Unable to register server\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -876 +876 @@
         if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/srv/hid/isdv4_tablet/main.c

@@ -315 +315 @@
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 
         service_id_t service_id;
         char *service_name;
-        rc = asprintf(&service_name, "mouse/isdv4-%" PRIun, svc_id);
-        if (rc < 0) {
+        if (asprintf(&service_name, "mouse/isdv4-%" PRIun, svc_id) < 0) {
                 printf(NAME ": Unable to create service name\n");
-                return rc;
+                return EXIT_RC(ENOMEM);
         }
 
@@ -329 +328 @@
         if (rc != EOK) {
                 printf(NAME ": Unable to register service %s.\n", service_name);
-                return rc;
+                return EXIT_RC(rc);
         }
 

uspace/srv/hid/output/output.c

@@ -470 +470 @@
         if (rc != EOK) {
                 printf("%s: Unable to register driver\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
         
@@ -477 +477 @@
         if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/srv/hid/remcons/remcons.c

@@ -353 +353 @@
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register server\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 
@@ -359 +359 @@
         if (rc != EOK) {
                 fprintf(stderr, "%s: Error initializing TCP.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 
@@ -369 +369 @@
         if (rc != EOK) {
                 fprintf(stderr, "%s: Error creating listener.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 

uspace/srv/hid/rfb/main.c

@@ -220 +220 @@
         if (rc != EOK) {
                 printf("%s: Unable to register server.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 
         char *service_name;
-        rc = asprintf(&service_name, "rfb/%s", rfb_name);
-        if (rc < 0) {
+        if (asprintf(&service_name, "rfb/%s", rfb_name) < 0) {
                 printf(NAME ": Unable to create service name\n");
-                return rc;
+                return EXIT_RC(ENOMEM);
         }
 
@@ -235 +234 @@
         if (rc != EOK) {
                 printf(NAME ": Unable to register service %s.\n", service_name);
-                return rc;
+                return EXIT_RC(rc);
         }
         

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -88 +88 @@
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
-                return rc;
+                return EXIT_RC(rc);
         }
 
@@ -95 +95 @@
                 return -1;
 
-        if (s3c24xx_ts_init(ts) != EOK)
+        if (s3c24xx_ts_init(ts) != 0)
                 return -1;
 
@@ -141 +141 @@
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
 
-        return EOK;
+        return 0;
 }