From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf27G-0000x3-9w for qemu-devel@nongnu.org; Thu, 24 Sep 2015 04:42:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf27D-0006GR-Fw for qemu-devel@nongnu.org; Thu, 24 Sep 2015 04:42:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf27D-0006G3-0N for qemu-devel@nongnu.org; Thu, 24 Sep 2015 04:42:55 -0400 From: Gerd Hoffmann Date: Thu, 24 Sep 2015 10:42:04 +0200 Message-Id: <1443084128-25552-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1443084128-25552-1-git-send-email-kraxel@redhat.com> References: <1443084128-25552-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RfC PATCH 06/10] io: add qio_buffer_move List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven , Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- include/io/buffer.h | 10 ++++++++++ io/buffer.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/io/buffer.h b/include/io/buffer.h index 1dddc73..5676aff 100644 --- a/include/io/buffer.h +++ b/include/io/buffer.h @@ -137,4 +137,14 @@ gboolean qio_buffer_empty(QIOBuffer *buffer); */ void qio_buffer_move_empty(QIOBuffer *to, QIOBuffer *from); +/** + * qio_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 qio_buffer_move(QIOBuffer *to, QIOBuffer *from); + #endif /* QIO_BUFFER_H__ */ diff --git a/io/buffer.c b/io/buffer.c index 09ca321..96077d3 100644 --- a/io/buffer.c +++ b/io/buffer.c @@ -91,3 +91,19 @@ void qio_buffer_move_empty(QIOBuffer *to, QIOBuffer *from) from->capacity = 0; from->buffer = NULL; } + +void qio_buffer_move(QIOBuffer *to, QIOBuffer *from) +{ + if (to->offset == 0) { + qio_buffer_move_empty(to, from); + return; + } + + qio_buffer_reserve(to, from->offset); + qio_buffer_append(to, from->buffer, from->offset); + + g_free(from->buffer); + from->offset = 0; + from->capacity = 0; + from->buffer = NULL; +} -- 1.8.3.1