doxygen

[disorder] / server / normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 7e5fbe8dc0aef7eae7289eb30b9dd4273c944104..dc69bb5fc4cdb277f7e5a43541796f139b298985 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-/** @file server/disorder-normalize.c
+/** @file server/normalize.c
  * @brief Convert "raw" format output to the configured format
  *
  * Currently we invoke sox even for trivial conversions such as byte-swapping.
@@ -47,26 +47,27 @@
  * @param n Number of bytes to copy
  */
 static void copy(int infd, int outfd, size_t n) {
-  char buffer[4096], *ptr;
-  int r, w;
+  char buffer[4096];
+  ssize_t written;
 
   while(n > 0) {
-    r = read(infd, buffer, sizeof buffer);
-    if(r < 0) {
+    const ssize_t readden = read(infd, buffer,
+                                 n > sizeof buffer ? sizeof buffer : n);
+    if(readden < 0) {
       if(errno == EINTR)
        continue;
       else
        fatal(errno, "read error");
     }
-    if(r == 0)
+    if(readden == 0)
       fatal(0, "unexpected EOF");
-    n -= r;
-    ptr = buffer;
-    while(r > 0) {
-      w = write(outfd, ptr, r - (ptr - buffer));
+    n -= readden;
+    written = 0;
+    while(written < readden) {
+      const ssize_t w = write(outfd, buffer + written, readden - written);
       if(w < 0)
        fatal(errno, "write error");
-      ptr += w;
+      written += w;
     }
   }
 }