From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxEG3-0000OS-6W for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:05:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxEG1-0000Mj-JG for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:05:39 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59384 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxEG1-0008Jn-9L for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:05:37 -0500 From: Tim Hardeck Date: Mon, 21 Jan 2013 11:04:43 +0100 Message-Id: <1358762685-676-2-git-send-email-thardeck@suse.de> In-Reply-To: <1358762685-676-1-git-send-email-thardeck@suse.de> References: <1358762685-676-1-git-send-email-thardeck@suse.de> Subject: [Qemu-devel] [PATCH 1/3] vnc: added buffer_advance function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@gmail.com, github@martintribe.org, blauwirbel@gmail.com, Tim Hardeck , alevy@redhat.com, kraxel@redhat.com, corentin.chary@gmail.com Following Anthony Liguori's Websocket implementation I have added the buffer_advance function to VNC and replaced all related buffer memmove operations with it. Signed-off-by: Tim Hardeck Reviewed-by: Anthony Liguori --- ui/vnc.c | 13 +++++++++---- ui/vnc.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 8912b78..ddf01f1 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -510,6 +510,13 @@ void buffer_append(Buffer *buffer, const void *data, size_t len) buffer->offset += len; } +void buffer_advance(Buffer *buf, size_t len) +{ + memmove(buf->buffer, buf->buffer + len, + (buf->offset - len)); + buf->offset -= len; +} + static void vnc_desktop_resize(VncState *vs) { DisplayState *ds = vs->ds; @@ -1166,8 +1173,7 @@ static long vnc_client_write_plain(VncState *vs) if (!ret) return 0; - memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret)); - vs->output.offset -= ret; + buffer_advance(&vs->output, ret); if (vs->output.offset == 0) { qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); @@ -1313,8 +1319,7 @@ void vnc_client_read(void *opaque) } if (!ret) { - memmove(vs->input.buffer, vs->input.buffer + len, (vs->input.offset - len)); - vs->input.offset -= len; + buffer_advance(&vs->input, len); } else { vs->read_handler_expect = ret; } diff --git a/ui/vnc.h b/ui/vnc.h index 8b40f09..5059cbe 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -510,6 +510,7 @@ void buffer_reserve(Buffer *buffer, size_t len); void buffer_reset(Buffer *buffer); void buffer_free(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len); +void buffer_advance(Buffer *buf, size_t len); /* Misc helpers */ -- 1.7.10.4