diff libaudacious/beepctrl.c @ 1582:d7af2755a397 trunk

[svn] - gcc 4.1.0, 4.1.1, 4.1.2 tree optimization workaround: Remove read_all() and write_all() routines. They had no effect nor merit here, and generally caused trouble.

--- a/libaudacious/beepctrl.c	Mon Aug 14 17:47:24 2006 -0700
+++ b/libaudacious/beepctrl.c	Mon Aug 14 17:55:44 2006 -0700
@@ -45,55 +45,17 @@
 #include <unistd.h>
 #endif
 
-static gint
-read_all(gint fd, gpointer buf, size_t count)
-{
-    size_t left = count;
-    gint r;
-
-    do {
-        if ((r = read(fd, buf, left)) < 0) {
-            count = -1;
-            break;
-        }
-        left -= r;
-        buf = (gchar *) buf + r;
-    }
-    while (left > 0);
-
-    return count - left;
-}
-
-static gint
-write_all(gint fd, gconstpointer buf, size_t count)
-{
-    size_t left = count;
-    gint written;
-
-    do {
-        if ((written = write(fd, buf, left)) < 0) {
-            count = -1;
-            break;
-        }
-        left -= written;
-        buf = (gchar *) buf + written;
-    }
-    while (left > 0);
-
-    return count - left;
-}
-
 static gpointer
 remote_read_packet(gint fd, ServerPktHeader * pkt_hdr)
 {
     gpointer data = NULL;
 
-    if (read_all(fd, pkt_hdr, sizeof(ServerPktHeader)) ==
+    if (read(fd, pkt_hdr, sizeof(ServerPktHeader)) ==
         sizeof(ServerPktHeader)) {
         if (pkt_hdr->data_length) {
             size_t data_length = pkt_hdr->data_length;
             data = g_malloc0(data_length);
-            if ((size_t)read_all(fd, data, data_length) < data_length) {
+            if ((size_t)read(fd, data, data_length) < data_length) {
                 g_free(data);
                 data = NULL;
             }
@@ -123,10 +85,10 @@
     pkt_hdr.version = XMMS_PROTOCOL_VERSION;
     pkt_hdr.command = command;
     pkt_hdr.data_length = data_length;
-    if ((size_t)write_all(fd, &pkt_hdr, sizeof(ClientPktHeader)) < sizeof(pkt_hdr))
+    if ((size_t)write(fd, &pkt_hdr, sizeof(ClientPktHeader)) < sizeof(pkt_hdr))
         return;
     if (data_length && data)
-        write_all(fd, data, data_length);
+        write(fd, data, data_length);
 }
 
 static void