# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1122928981 -3600
# Node ID 468c9cac279896d4dea428ed719169744322af88
# Parent  6e895f39747410750d3a543caa9e49ea1efbc7e8
Minor changes to hbuf.c

- remove useless do {} while with g_new()
- some g_free() were missing


diff -r 6e895f397474 -r 468c9cac2798 mcabber/src/hbuf.c
--- a/mcabber/src/hbuf.c	Sat Jul 30 10:36:46 2005 +0100
+++ b/mcabber/src/hbuf.c	Mon Aug 01 21:43:01 2005 +0100
@@ -62,9 +62,7 @@
   hbuf_block_elt->prefix.timestamp  = timestamp;
   hbuf_block_elt->prefix.flags      = prefix_flags;
   if (!hbuf) {
-    do {
-      hbuf_block_elt->ptr  = g_new(char, HBB_BLOCKSIZE);
-    } while (!hbuf_block_elt->ptr);
+    hbuf_block_elt->ptr  = g_new(char, HBB_BLOCKSIZE);
     hbuf_block_elt->flags  = HBB_FLAG_ALLOC | HBB_FLAG_PERSISTENT;
     hbuf_block_elt->ptr_end_alloc = hbuf_block_elt->ptr + HBB_BLOCKSIZE;
     *p_hbuf = g_list_append(*p_hbuf, hbuf_block_elt);
@@ -83,9 +81,7 @@
   }
   if (hbuf_block_elt->ptr + strlen(text) >= hbuf_block_elt->ptr_end_alloc) {
     // Too long for the current allocated bloc, we need another one
-    do {
-      hbuf_block_elt->ptr  = g_new0(char, HBB_BLOCKSIZE);
-    } while (!hbuf_block_elt->ptr);
+    hbuf_block_elt->ptr  = g_new0(char, HBB_BLOCKSIZE);
     hbuf_block_elt->flags  = HBB_FLAG_ALLOC | HBB_FLAG_PERSISTENT;
     hbuf_block_elt->ptr_end_alloc = hbuf_block_elt->ptr + HBB_BLOCKSIZE;
   }
@@ -151,6 +147,7 @@
     if (hbuf_b_elt->flags & HBB_FLAG_ALLOC) {
       g_free(hbuf_b_elt->ptr);
     }
+    g_free(hbuf_b_elt);
   }
 
   g_list_free(*p_hbuf);
@@ -180,6 +177,7 @@
     // Is next line not-persistent?
     if (!(hbuf_b_next->flags & HBB_FLAG_PERSISTENT)) {
       hbuf_b_curr->ptr_end = hbuf_b_next->ptr_end;
+      g_free(hbuf_b_next);
       g_list_delete_link(curr_elt, next_elt);
     } else 
       curr_elt = next_elt;