Changeset 8e3498b in mainline for uspace/app/websrv/websrv.c

Timestamp:

2017-12-04T18:44:24Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

File:

• uspace/app/websrv/websrv.c (modified) (2 diffs)

uspace/app/websrv/websrv.c

@@ -247 +247 @@
         char *fname = NULL;
         int rc;
+        size_t nr;
         int fd = -1;
         
@@ -279 +280 @@
         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);