Changeset 3444 for neercs/trunk/src/server.cTweet

Timestamp:

05/13/09 10:56:59 (4 years ago)

Author:

pterjan

Message:

• Remove a memcpy

File:

• neercs/trunk/src/server.c (modified) (2 diffs)

neercs/trunk/src/server.c

@@ -99 +99 @@
     size_t bytes;
     void *buf;
-    char *buf2;
     buf = caca_export_memory (screen_list->cv, "caca", &bytes);
-    buf2 = malloc(bytes+8);
-    memcpy(buf2, "REFRESH ", 8);
-    memcpy(buf2+8, buf, bytes);
     if(!screen_list->socket[SOCK_CLIENT])
         connect_socket(screen_list, SOCK_CLIENT);
     if(screen_list->socket[SOCK_CLIENT])
     {
-        size_t bufsize, towrite = bytes+8;
-        ssize_t written;
+        size_t bufsize, towrite = bytes;
+        ssize_t written = 0, ret;
         socklen_t optlen = sizeof(bufsize);
-        debug("Requesting refresh for %d", bytes+8);
+        debug("Requesting refresh for %d", bytes);
+        
         getsockopt(screen_list->socket[SOCK_CLIENT], SOL_SOCKET, SO_SNDBUF,
                    &bufsize, &optlen);
         bufsize /= 2;
         debug("bufsize=%d", bufsize);
-        written = write(screen_list->socket[SOCK_CLIENT],
-                        buf2,
-                        towrite > bufsize ? bufsize : towrite);
-        if(written <= 0 && errno != EAGAIN)
-        {
-            debug("Can't refresh (%s), with %d bytes (out of %d)", strerror(errno), towrite > bufsize ? bufsize : towrite, towrite);
+        ret = write(screen_list->socket[SOCK_CLIENT],
+                    "REFRESH ",
+                    8);
+        if(ret <= 8 && errno != EAGAIN)
+        {
+            free(buf);
             return -1;
         }
-        debug("Wrote %d bytes", written);
-        towrite -= written;
-        while(written > 0 && towrite > 0)
+        while(towrite > 0)
         {
             ssize_t n;
             debug("Wrote %d, %d remaining", written, towrite);
-            /* Block to read the end of the message */
+            /* Block to write the end of the message */
             fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
             n = write(screen_list->socket[SOCK_CLIENT],
-                      buf2 + written,
+                      (char *)buf + written,
                       towrite > bufsize ? bufsize : towrite);
             if(n < 0)
             {
-                debug("Can't refresh (%s), with %d bytes", strerror(errno), bytes+8);
+                debug("Can't refresh (%s), with %d bytes (out of %d)", strerror(errno), towrite > bufsize ? bufsize : towrite, towrite);
                 return -1;
             } 
@@ -146 +141 @@
     }
     free(buf);
-    free(buf2);
     return 0;
 }