Changeset ce04ea44 in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2017-04-02T12:27:14Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d4067a7

Parents:

163fc09

Message:

Rename read() to vfs_read() and write() to vfs_write()

File:

• uspace/lib/c/generic/io/io.c (modified) (3 diffs)

uspace/lib/c/generic/io/io.c

@@ -434 +434 @@
                 return 0;
 
-        ssize_t rd = read(stream->fd, &stream->pos, buf, size * nmemb);
+        ssize_t rd = vfs_read(stream->fd, &stream->pos, buf, size * nmemb);
         if (rd < 0) {
-                /* errno was set by read() */
+                errno = rd;
                 stream->error = true;
                 rd = 0;
@@ -472 +472 @@
                 }
         } else {
-                wr = write(stream->fd, &stream->pos, buf, size * nmemb);
+                wr = vfs_write(stream->fd, &stream->pos, buf, size * nmemb);
                 if (wr < 0) {
-                        /* errno was set by write() */
+                        errno = wr;
                         stream->error = true;
                         wr = 0;
@@ -496 +496 @@
         stream->buf_head = stream->buf_tail = stream->buf;
 
-        rc = read(stream->fd, &stream->pos, stream->buf, stream->buf_size);
+        rc = vfs_read(stream->fd, &stream->pos, stream->buf, stream->buf_size);
         if (rc < 0) {
-                /* errno was set by read() */
+                errno = rc;
                 stream->error = true;
                 return;