Changeset 1569a9b in mainline for uspace/app

Timestamp:

2017-12-24T16:40:33Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (4 diffs)
• bdsh/input.c (modified) (3 diffs)
• fontviewer/fontviewer.c (modified) (1 diff)
• init/init.c (modified) (1 diff)
• pkg/pkg.c (modified) (1 diff)
• trace/ipcp.c (modified) (1 diff)
• trace/trace.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -101 +101 @@
                     memcmp(buffer[0], buffer[1], offset[0]) != 0) {
                         printf("Return 1\n");
-                        rc = 1;
+                        rc = EBUSY;
                         goto end;
                 }

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -266 +266 @@
 
                 /* call copy_file and exit */
-                rc = (copy_file(src, dest_path, blen, vb) < 0);
+                if (copy_file(src, dest_path, blen, vb) < 0) {
+                        rc = EIO;
+                }
 
         } else if (src_type == TYPE_DIR) {
@@ -434 +436 @@
         if (rc != EOK) {
                 printf("\nError copying %s: %s\n", src, str_error(rc));
-                return rc;
+                return -1;
         }
 
@@ -442 +444 @@
         if (buff)
                 free(buff);
-        return rc;
+        if (rc != EOK) {
+                return -1;
+        } else {
+                return 0;
+        }
 }
 
@@ -473 +479 @@
         int force = 0, interactive = 0;
         int c, opt_ind;
-        int64_t ret;
+        int ret;
 
         con = console_init(stdin, stdout);

uspace/app/bdsh/input.c

@@ -73 +73 @@
         
         char *cmd[WORD_MAX];
-        int rc = 0;
+        int rc = EOK;
         tokenizer_t tok;
         unsigned int i, pipe_count, processed_pipes;
@@ -82 +82 @@
         if (usr->line == NULL) {
                 free(tokens_buf);
-                return CL_EFAIL;
+                return EINVAL;
         }
 
@@ -198 +198 @@
         }
 
-        rc = run_command(cmd, usr, &new_iostate);
+        if (run_command(cmd, usr, &new_iostate) == 0) {
+                rc = EOK;
+        } else {
+                rc = EINVAL;
+        }
         
 finit_with_files:

uspace/app/fontviewer/fontviewer.c

@@ -149 +149 @@
         va_end(args);
         
-        if (ret <= 0)
-                return ret;
-        
-        drawctx_set_source(drawctx, source);
-        drawctx_set_font(drawctx, font);
-        drawctx_print(drawctx, str, x, y);
-        
-        free(str);
+        if (ret >= 0) {
+                drawctx_set_source(drawctx, source);
+                drawctx_set_font(drawctx, font);
+                drawctx_print(drawctx, str, x, y);
+
+                free(str);
+        }
         
         return ret;

uspace/app/init/init.c

@@ -208 +208 @@
                     path, retval);
         
-        return retval;
+        return retval == 0 ? EOK : EPARTY;
 }
 

uspace/app/pkg/pkg.c

@@ -96 +96 @@
         }
 
-        return retval;
+        return retval == 0 ? EOK : EPARTY;
 }
 

uspace/app/trace/ipcp.c

@@ -281 +281 @@
                         if (oper->rv_type != V_VOID) {
                                 putchar(' ');
-                                val_print(retval, oper->rv_type);
+                                val_print((sysarg_t) retval, oper->rv_type);
                         }
                         

uspace/app/trace/trace.c

@@ -260 +260 @@
 
 
-static void print_sc_retval(int retval, val_type_t val_type)
+static void print_sc_retval(sysarg_t retval, val_type_t val_type)
 {
         printf(" -> ");
@@ -296 +296 @@
         IPC_SET_ARG5(call, 0);
 
-        ipcp_call_out(phoneid, &call, sc_rc);
-}
-
-static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)
+        ipcp_call_out(phoneid, &call, 0);
+}
+
+static void sc_ipc_call_async_slow(sysarg_t *sc_args, int sc_rc)
 {
         ipc_call_t call;
         int rc;
 
-        if (sc_rc != (sysarg_t) EOK)
+        if (sc_rc != EOK)
                 return;
 
@@ -310 +310 @@
         rc = udebug_mem_read(sess, &call.args, sc_args[1], sizeof(call.args));
 
-        if (rc >= 0) {
-                ipcp_call_out(sc_args[0], &call, sc_rc);
+        if (rc == EOK) {
+                ipcp_call_out(sc_args[0], &call, 0);
         }
 }
@@ -581 +581 @@
                 
                 if (!console_get_event(console, &event))
-                        return -1;
+                        return EINVAL;
                 
                 if (event.type == CEV_KEY) {