Changes in uspace/lib/riff/src/chunk.c [bad765a:20667af] in mainline

File:

• uspace/lib/riff/src/chunk.c (modified) (5 diffs)

uspace/lib/riff/src/chunk.c

@@ -146 +146 @@
         long pos;
         long cksize;
-        uint8_t pad;
-        size_t nw;
         errno_t rc;
 
@@ -155 +153 @@
 
         cksize = pos - wchunk->ckstart;
-        if (pos % 2 != 0) {
+        if (pos % 2 != 0)
                 ++pos;
-                pad = 0;
-                nw = fwrite(&pad, 1, sizeof(pad), rw->f);
-                if (nw != sizeof(pad))
-                        return EIO;
-        }
 
         if (fseek(rw->f, wchunk->ckstart - 4, SEEK_SET) < 0)
@@ -483 +476 @@
         uint8_t byte;
         size_t nread;
+        errno_t rc;
 
         ckend = riff_rchunk_get_ndpos(rchunk);
@@ -489 +483 @@
                 /* (Buffered) reading is faster than seeking */
                 while (rchunk->riffr->pos < ckend) {
-                        nread = fread(&byte, 1, sizeof(byte), rchunk->riffr->f);
+                        rc = riff_read(rchunk, &byte, sizeof(byte), &nread);
+                        if (rc != EOK)
+                                return rc;
+
                         if (nread != sizeof(byte))
                                 return EIO;
-
-                        rchunk->riffr->pos += sizeof(byte);
                 }
 
@@ -500 +495 @@
                 if (fseek(rchunk->riffr->f, ckend, SEEK_SET) < 0)
                         return EIO;
-
                 rchunk->riffr->pos = ckend;
         }