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

uspace/app/websrv/websrv.c

@@ -168 +168 @@
                 rc = tcp_conn_recv_wait(recv->conn, recv->rbuf, BUFFER_SIZE, &nrecv);
                 if (rc != EOK) {
-                        fprintf(stderr, "tcp_conn_recv() failed (%d)\n", rc);
+                        fprintf(stderr, "tcp_conn_recv() failed: %s\n", str_error(rc));
                         return rc;
                 }
@@ -247 +247 @@
         char *fname = NULL;
         int rc;
+        size_t nr;
         int fd = -1;
         
@@ -258 +259 @@
                 uri = "/index.html";
         
-        rc = asprintf(&fname, "%s%s", WEB_ROOT, uri);
-        if (rc < 0) {
+        if (asprintf(&fname, "%s%s", WEB_ROOT, uri) < 0) {
                 rc = ENOMEM;
                 goto out;
         }
         
-        fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
+        rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
                 rc = send_response(conn, msg_not_found);
                 goto out;
@@ -279 +279 @@
         aoff64_t pos = 0;
         while (true) {
-                ssize_t nr = vfs_read(fd, &pos, fbuf, BUFFER_SIZE);
+                rc = vfs_read(fd, &pos, fbuf, BUFFER_SIZE, &nr);
+                if (rc != EOK)
+                        goto out;
+                
                 if (nr == 0)
                         break;
-                
-                if (nr < 0) {
-                        rc = EIO;
-                        goto out;
-                }
                 
                 rc = tcp_conn_send(conn, fbuf, nr);