[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/12] vnc: add buffer_free()
From: |
Corentin Chary |
Subject: |
[Qemu-devel] [PATCH v3 07/12] vnc: add buffer_free() |
Date: |
Wed, 19 May 2010 09:24:07 +0200 |
Add a buffer_free() helper to free vnc buffers and
remove some duplicated code in vnc_disconnect_finish().
Signed-off-by: Corentin Chary <address@hidden>
---
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);
--
1.7.0.2
- [Qemu-devel] [PATCH v3 00/12] *** SUBJECT HERE ***, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 01/12] Revert "vnc: set the right prefered encoding", Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 04/12] vnc: only use a single zlib stream, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 03/12] vnc: really call zlib if we want zlib, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 02/12] vnc: explain why set_encodings loop is reversed, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 05/12] vnc: adjust compression zstream level, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 08/12] vnc: remove a memory leak in zlib, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 12/12] vnc: tight: add palette encoding, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 07/12] vnc: add buffer_free(),
Corentin Chary <=
- [Qemu-devel] [PATCH v3 06/12] vnc: don't clear zlib stream on set_encoding, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 10/12] vnc: add basic tight support, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 11/12] vnc: add support for tight fill encoding, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH v3 09/12] vnc: return the number of rectangles, Corentin Chary, 2010/05/19
- Re: [Qemu-devel] [PATCH v3 00/12] *** SUBJECT HERE ***, Corentin Chary, 2010/05/19
- [Qemu-devel] [PATCH 3/3] vnc: add missing target for vnc-encodings-*.o, Corentin Chary, 2010/05/27
- [Qemu-devel] [PATCH 1/3] vnc: tight: don't forget last pixel in tight_encode_indexed_rect, Corentin Chary, 2010/05/27
- [Qemu-devel] [PATCH 2/3] vnc: tight: don't forget the third color, Corentin Chary, 2010/05/27