Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSuVi-00014E-Bo for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSuVe-00010u-UU for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:19 -0500 Received: from [199.232.76.173] (port=37689 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSuVe-00010K-Eb for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:18 -0500 Received: from ns2.suse.de ([195.135.220.15]:48165 helo=mx2.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSuVd-0007x6-Q7 for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:18 -0500 From: Alexander Graf Date: Fri, 30 Jan 2009 15:38:11 +0100 Message-Id: <1233326293-8591-6-git-send-email-agraf@suse.de> In-Reply-To: <1233326293-8591-5-git-send-email-agraf@suse.de> References: <1233326293-8591-1-git-send-email-agraf@suse.de> <1233326293-8591-2-git-send-email-agraf@suse.de> <1233326293-8591-3-git-send-email-agraf@suse.de> <1233326293-8591-4-git-send-email-agraf@suse.de> <1233326293-8591-5-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 5/7] Move buffer functions up Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org We will need to use buffer functions in code that will end up being below the current buffer functions. In order to not introduce any function stub defines, let's just move them up. Signed-off-by: Alexander Graf --- vnc.c | 66 ++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/vnc.c b/vnc.c index 31ea131..b3b4bfd 100644 --- a/vnc.c +++ b/vnc.c @@ -263,6 +263,39 @@ static void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h, vnc_write_s32(vs, encoding); } +static void buffer_reserve(Buffer *buffer, size_t len) +{ + if ((buffer->capacity - buffer->offset) < len) { + buffer->capacity += (len + 1024); + buffer->buffer = qemu_realloc(buffer->buffer, buffer->capacity); + if (buffer->buffer == NULL) { + fprintf(stderr, "vnc: out of memory\n"); + exit(1); + } + } +} + +static int buffer_empty(Buffer *buffer) +{ + return buffer->offset == 0; +} + +static uint8_t *buffer_end(Buffer *buffer) +{ + return buffer->buffer + buffer->offset; +} + +static void buffer_reset(Buffer *buffer) +{ + buffer->offset = 0; +} + +static void buffer_append(Buffer *buffer, const void *data, size_t len) +{ + memcpy(buffer->buffer + buffer->offset, data, len); + buffer->offset += len; +} + static void vnc_dpy_resize(DisplayState *ds) { int size_changed; @@ -598,39 +631,6 @@ static int vnc_listen_poll(void *opaque) return 0; } -static void buffer_reserve(Buffer *buffer, size_t len) -{ - if ((buffer->capacity - buffer->offset) < len) { - buffer->capacity += (len + 1024); - buffer->buffer = qemu_realloc(buffer->buffer, buffer->capacity); - if (buffer->buffer == NULL) { - fprintf(stderr, "vnc: out of memory\n"); - exit(1); - } - } -} - -static int buffer_empty(Buffer *buffer) -{ - return buffer->offset == 0; -} - -static uint8_t *buffer_end(Buffer *buffer) -{ - return buffer->buffer + buffer->offset; -} - -static void buffer_reset(Buffer *buffer) -{ - buffer->offset = 0; -} - -static void buffer_append(Buffer *buffer, const void *data, size_t len) -{ - memcpy(buffer->buffer + buffer->offset, data, len); - buffer->offset += len; -} - /* audio */ static void audio_capture_notify(void *opaque, audcnotification_e cmd) { -- 1.6.0.2