From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zg-0005e7-Hl for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs7Zd-0002YC-A8 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zd-0002Xb-3c for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:21 -0400 From: Gerd Hoffmann Date: Fri, 30 Oct 2015 12:09:59 +0100 Message-Id: <1446203414-4013-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1446203414-4013-1-git-send-email-kraxel@redhat.com> References: <1446203414-4013-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 04/19] buffer: add buffer_move List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pl@kamp.de, Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Lieven --- include/qemu/buffer.h | 10 ++++++++++ util/buffer.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/qemu/buffer.h b/include/qemu/buffer.h index f53ee9e..1358df1 100644 --- a/include/qemu/buffer.h +++ b/include/qemu/buffer.h @@ -137,4 +137,14 @@ gboolean buffer_empty(Buffer *buffer); */ void buffer_move_empty(Buffer *to, Buffer *from); +/** + * buffer_move: + * @to: destination buffer object + * @from: source buffer object + * + * Moves buffer, copying data (unless 'to' buffer happens to be empty). + * 'from' buffer is empty and zero-sized on return. + */ +void buffer_move(Buffer *to, Buffer *from); + #endif /* QEMU_BUFFER_H__ */ diff --git a/util/buffer.c b/util/buffer.c index c7a39ec..e8f798e 100644 --- a/util/buffer.c +++ b/util/buffer.c @@ -91,3 +91,19 @@ void buffer_move_empty(Buffer *to, Buffer *from) from->capacity = 0; from->buffer = NULL; } + +void buffer_move(Buffer *to, Buffer *from) +{ + if (to->offset == 0) { + buffer_move_empty(to, from); + return; + } + + buffer_reserve(to, from->offset); + buffer_append(to, from->buffer, from->offset); + + g_free(from->buffer); + from->offset = 0; + from->capacity = 0; + from->buffer = NULL; +} -- 1.8.3.1