Changeset 132ab5d1 in mainline for uspace/app/bdsh/cmds/modules/cmp/cmp.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/bdsh/cmds/modules/cmp/cmp.c (modified) (3 diffs)

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

@@ -72 +72 @@
 static int cmp_files(const char *fn0, const char *fn1)
 {
-        int rc = 0;
+        int rc = EOK;
         const char *fn[2] = {fn0, fn1};
         int fd[2] = {-1, -1};
         char buffer[2][CMP_BUFLEN];
-        ssize_t offset[2];
+        size_t offset[2];
         aoff64_t pos[2] = {};
 
         for (int i = 0; i < 2; i++) {
-                fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
-                if (fd[i] < 0) {
-                        rc = fd[i];
+                rc = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ, &(fd[i]));
+                if (rc != EOK) {
                         printf("Unable to open %s\n", fn[i]);
                         goto end;
@@ -90 +89 @@
         do {
                 for (int i = 0; i < 2; i++) {
-                        offset[i] = 0;
-                        ssize_t size;
-                        do {
-                                size = vfs_read(fd[i], &pos[i],
-                                    buffer[i] + offset[i],
-                                    CMP_BUFLEN - offset[i]);
-                                if (size < 0) {
-                                        rc = size;
-                                        printf("Error reading from %s\n",
-                                            fn[i]);
-                                        goto end;
-                                }
-                                offset[i] += size;
-                        } while (size && offset[i] < CMP_BUFLEN);
+                        rc = vfs_read(fd[i], &pos[i], buffer[i], CMP_BUFLEN,
+                            &offset[i]);
+                        if (rc != EOK) {
+                                printf("Error reading from %s\n",
+                                    fn[i]);
+                                goto end;
+                        }
                 }
 
                 if (offset[0] != offset[1] ||
                     memcmp(buffer[0], buffer[1], offset[0]) != 0) {
-                        rc = 1;
+                        printf("Return 1\n");
+                        rc = EBUSY;
                         goto end;
                 }
@@ -149 +142 @@
 
         rc = cmp_files(argv[optind], argv[optind + 1]);
-        if (rc)
+        if (rc != EOK)
                 return CMD_FAILURE;
         else