From patchwork Wed May 19 07:24:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 52960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6321AB7D68 for ; Wed, 19 May 2010 17:39:16 +1000 (EST) Received: from localhost ([127.0.0.1]:55599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEds1-0004D5-17 for incoming@patchwork.ozlabs.org; Wed, 19 May 2010 03:39:13 -0400 Received: from [140.186.70.92] (port=54591 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEda6-0004AK-Fo for qemu-devel@nongnu.org; Wed, 19 May 2010 03:21:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEdZw-0008Np-5L for qemu-devel@nongnu.org; Wed, 19 May 2010 03:20:42 -0400 Received: from iksaif.net ([88.191.73.63]:39154) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEdZu-0008N5-GL for qemu-devel@nongnu.org; Wed, 19 May 2010 03:20:30 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 0DA09C90037; Wed, 19 May 2010 09:24:14 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Wed, 19 May 2010 09:24:07 +0200 Message-Id: <1274253852-16068-8-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1274253852-16068-1-git-send-email-corentincj@iksaif.net> References: <1274253852-16068-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke Subject: [Qemu-devel] [PATCH v3 07/12] vnc: add buffer_free() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a buffer_free() helper to free vnc buffers and remove some duplicated code in vnc_disconnect_finish(). Signed-off-by: Corentin Chary --- vnc.c | 18 ++++++++++-------- vnc.h | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/vnc.c b/vnc.c index a5a0456..8f256b3 100644 --- a/vnc.c +++ b/vnc.c @@ -506,6 +506,14 @@ void buffer_reset(Buffer *buffer) buffer->offset = 0; } +void buffer_free(Buffer *buffer) +{ + qemu_free(buffer->buffer); + buffer->offset = 0; + buffer->capacity = 0; + buffer->buffer = NULL; +} + void buffer_append(Buffer *buffer, const void *data, size_t len) { memcpy(buffer->buffer + buffer->offset, data, len); @@ -911,14 +919,8 @@ static void vnc_disconnect_finish(VncState *vs) { vnc_qmp_event(vs, QEVENT_VNC_DISCONNECTED); - if (vs->input.buffer) { - qemu_free(vs->input.buffer); - vs->input.buffer = NULL; - } - if (vs->output.buffer) { - qemu_free(vs->output.buffer); - vs->output.buffer = NULL; - } + buffer_free(&vs->input); + buffer_free(&vs->output); qobject_decref(vs->info); diff --git a/vnc.h b/vnc.h index b2d8738..abd9f27 100644 --- a/vnc.h +++ b/vnc.h @@ -376,6 +376,7 @@ void buffer_reserve(Buffer *buffer, size_t len); int buffer_empty(Buffer *buffer); uint8_t *buffer_end(Buffer *buffer); void buffer_reset(Buffer *buffer); +void buffer_free(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len);