External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 11:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Make sure the comment about virBufferAddBuffer is true

Browse Source 
Change it so it really *always* eats the @toadd buffer.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2015-03-13 16:41:42 +01:00
parent 57f726a50b
commit 3a13e4f178
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/virbuffer.c
View File

@ -1,7 +1,7 @@
/* /*
* virbuffer.c: buffers for libvirt * virbuffer.c: buffers for libvirt
* *
* Copyright (C) 2005-2008, 2010-2014 Red Hat, Inc. * Copyright (C) 2005-2008, 2010-2015 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -188,23 +188,27 @@ virBufferAddBuffer(virBufferPtr buf, virBufferPtr toadd)
{ {
unsigned int needSize; unsigned int needSize;
if (!buf || !toadd) if (!toadd)
return; return;
if (!buf)
goto done;
if (buf->error || toadd->error) { if (buf->error || toadd->error) {
if (!buf->error) if (!buf->error)
buf->error = toadd->error; buf->error = toadd->error;
virBufferFreeAndReset(toadd); goto done;
return;
} }
needSize = buf->use + toadd->use; needSize = buf->use + toadd->use;
if (virBufferGrow(buf, needSize - buf->use) < 0) if (virBufferGrow(buf, needSize - buf->use) < 0)
return; goto done;
memcpy(&buf->content[buf->use], toadd->content, toadd->use); memcpy(&buf->content[buf->use], toadd->content, toadd->use);
buf->use += toadd->use; buf->use += toadd->use;
buf->content[buf->use] = '\0'; buf->content[buf->use] = '\0';
done:
virBufferFreeAndReset(toadd); virBufferFreeAndReset(toadd);
} }