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

uspace/app/pkg/pkg.c

@@ -96 +96 @@
         }
 
-        return retval;
+        return retval == 0 ? EOK : EPARTY;
 }
 
@@ -107 +107 @@
         char *fnunpack;
         int rc;
+        int ret;
 
         if (argc != 3) {
@@ -115 +116 @@
         pkg_name = argv[2];
 
-        rc = asprintf(&src_uri, "http://ci.helenos.org/latest/" STRING(UARCH)
+        ret = asprintf(&src_uri, "http://ci.helenos.org/latest/" STRING(UARCH)
             "/%s-for-helenos-" STRING(UARCH) ".tar.gz",
             pkg_name);
-        if (rc < 0) {
+        if (ret < 0) {
                 printf("Out of memory.\n");
                 return ENOMEM;
         }
 
-        rc = asprintf(&fname, "/tmp/%s-for-helenos-" STRING(UARCH)
+        ret = asprintf(&fname, "/tmp/%s-for-helenos-" STRING(UARCH)
             ".tar.gz", pkg_name);
-        if (rc < 0) {
+        if (ret < 0) {
                 printf("Out of memory.\n");
                 return ENOMEM;
         }
 
-        rc = asprintf(&fnunpack, "/tmp/%s-for-helenos-" STRING(UARCH) ".tar",
+        ret = asprintf(&fnunpack, "/tmp/%s-for-helenos-" STRING(UARCH) ".tar",
             pkg_name);
-        if (rc < 0) {
+        if (ret < 0) {
                 printf("Out of memory.\n");
                 return ENOMEM;