Changeset 0b9ac3c in mainline for uspace/lib/libc/generic/io/io.c

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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 mainline changes.

File:

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

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

@@ -541 +541 @@
 }
 
-int fseek(FILE *stream, long offset, int origin)
-{
-        off_t rc = lseek(stream->fd, offset, origin);
-        if (rc == (off_t) (-1)) {
-                /* errno has been set by lseek. */
+int fseek(FILE *stream, off64_t offset, int whence)
+{
+        off64_t rc = lseek(stream->fd, offset, whence);
+        if (rc == (off64_t) (-1)) {
+                /* errno has been set by lseek64. */
                 return -1;
         }
@@ -554 +554 @@
 }
 
-int ftell(FILE *stream)
-{
-        off_t rc = lseek(stream->fd, 0, SEEK_CUR);
-        if (rc == (off_t) (-1)) {
-                /* errno has been set by lseek. */
-                return -1;
-        }
-
-        return rc;
+off64_t ftell(FILE *stream)
+{
+        return lseek(stream->fd, 0, SEEK_CUR);
 }