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

uspace/app/download/main.c

@@ -74 +74 @@
         http_t *http = NULL;
         int rc;
+        int ret;
 
         if (argc < 2) {
@@ -155 +156 @@
                 }
         } else {
-                rc = asprintf(&server_path, "%s?%s", path, uri->query);
-                if (rc < 0) {
+                ret = asprintf(&server_path, "%s?%s", path, uri->query);
+                if (ret < 0) {
                         fprintf(stderr, "Failed allocating path\n");
                         rc = ENOMEM;
@@ -224 +225 @@
                 }
                 
-                int body_size;
-                while ((body_size = recv_buffer(&http->recv_buffer, buf, buf_size)) > 0) {
+                size_t body_size;
+                while ((rc = recv_buffer(&http->recv_buffer, buf, buf_size, &body_size)) == EOK && body_size > 0) {
                         fwrite(buf, 1, body_size, ofile != NULL ? ofile : stdout);
                 }
                 
-                if (body_size != 0) {
-                        fprintf(stderr, "Failed receiving body: %s", str_error(body_size));
+                if (rc != EOK) {
+                        fprintf(stderr, "Failed receiving body: %s", str_error(rc));
                 }
         }