Changes in uspace/lib/libc/generic/io/io.c [c77a64f:db24058] in mainline

File:

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

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

@@ -341 +341 @@
 size_t fread(void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left, done;
-
-        if (size == 0 || nmemb == 0)
-                return 0;
-
+        size_t left = size * nmemb;
+        size_t done = 0;
+        
         /* Make sure no data is pending write. */
         _fflushbuf(stream);
-
-        left = size * nmemb;
-        done = 0;
         
         while ((left > 0) && (!stream->error) && (!stream->eof)) {
@@ -370 +365 @@
 static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left;
-        size_t done;
-
-        if (size == 0 || nmemb == 0)
-                return 0;
-
-        left = size * nmemb;
-        done = 0;
-
+        size_t left = size * nmemb;
+        size_t done = 0;
+        
         while ((left > 0) && (!stream->error)) {
                 ssize_t wr;
@@ -432 +421 @@
         uint8_t b;
         bool need_flush;
-
-        if (size == 0 || nmemb == 0)
-                return 0;
-
+        
         /* If not buffered stream, write out directly. */
         if (stream->btype == _IONBF) {
@@ -494 +480 @@
         
         if (chr_encode(c, buf, &sz, STR_BOUNDS(1)) == EOK) {
-                size_t wr = fwrite(buf, 1, sz, stream);
+                size_t wr = fwrite(buf, sz, 1, stream);
                 
                 if (wr < sz)
@@ -554 +540 @@
 }
 
-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;
-}
-
 void rewind(FILE *stream)
 {
@@ -595 +570 @@
 }
 
-void clearerr(FILE *stream)
-{
-        stream->eof = false;
-        stream->error = false;
-}
-
 int fphone(FILE *stream)
 {