commit 6f6feba876eeff3a75fc10cdc2f414cc66204dde
author Daniel Veillard <veillard@redhat.com> Wed Jul 25 16:30:56 2012 +0800
committer Daniel Veillard <veillard@redhat.com> Wed Jul 25 16:30:56 2012 +0800
tree 10815ad5e5d1af5756181bfcb65fc9432c8cebf0
parent 57560386503be0fd023f3b7537fd496784f3be18

Fixup for buf.c

buf.c

diff --git a/buf.c b/buf.c
index c2123aa..7e293e6 100644
--- a/buf.c
+++ b/buf.c
@@ -1141,11 +1141,12 @@
  */
 int
 xmlBufMergeBuffer(xmlBufPtr buf, xmlBufferPtr buffer) {
-    int ret;
+    int ret = 0;
 
     if ((buf == NULL) || (buf->error))
-        return(0);
-    if ((buf != NULL) && (buffer->content != NULL) && (buffer->use > 0)) {
+        ret = -1;
+    else if ((buffer != NULL) && (buffer->content != NULL) &&
+             (buffer->use > 0)) {
         ret = xmlBufAdd(buf, buffer->content, buffer->use);
     }
     xmlBufferFree(buffer);