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

Timestamp:

May 13, 2009, 10:56:59 AM (12 years ago)

Author:

Pascal Terjan

Message:

• Remove a memcpy

File:

• neercs/trunk/src/main.c (modified) (3 diffs)

neercs/trunk/src/main.c

@@ -177 +177 @@
             else if(!strncmp("REFRESH ", buf, 8))
             {
-                ssize_t l2, lb = n-8;
+                ssize_t l2 = 0, lb = 0;
                 char * buf2;
-                size_t l = caca_import_memory(screen_list->cv, buf+8, lb, "caca");
-                l2 = lb;
+                size_t l = 0;
                 /* 0 means we have valid data but incomplete, so read the rest */
                 while(l == 0)
                 {
-                    buf2 = realloc(buf, l2+8 + NEERCS_RECV_BUFSIZE);
+                    buf2 = realloc(buf, l2 + NEERCS_RECV_BUFSIZE);
                     if(!buf2)
                     {
@@ -192 +191 @@
                     buf = buf2;
                     fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
-                    lb = read(screen_list->socket[SOCK_CLIENT], buf+l2+8, NEERCS_RECV_BUFSIZE-1);
+                    lb = read(screen_list->socket[SOCK_CLIENT], buf+l2, NEERCS_RECV_BUFSIZE-1);
                     if(lb < 0)
                     {
@@ -202 +201 @@
                         debug("Got %d more bytes", lb);
                         l2 += lb;
-                        l = caca_import_memory(screen_list->cv, buf+8, l2, "caca");
+                        l = caca_import_memory(screen_list->cv, buf, l2, "caca");
                     }
                 }