bgets_mp(): Added a non-intuitive warning to documentation.

[libucw.git] / ucw / fb-pool.c

diff --git a/ucw/fb-pool.c b/ucw/fb-pool.c
index b55f09038da2d7417de285e5f41bf3694211b73a..01ce3443dcbd6b69dd97aadb93a7d00655176ed7 100644 (file)
--- a/ucw/fb-pool.c
+++ b/ucw/fb-pool.c
@@ -7,30 +7,29 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/mempool.h"
-#include "ucw/fastbuf.h"
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#define FB_POOL(f) ((struct fbpool *)(f)->is_fastbuf)
+#define FB_POOL(f) ((struct fbpool *)(f))
 
 static void
 fbpool_spout(struct fastbuf *b)
 {
-  if (b->bptr >= b->bufend)
+  if (b->bptr == b->bufend)
     {
-      uns len = b->bufend - b->buffer;
-      b->buffer = mp_expand(FB_POOL(b)->mp);
+      uint len = b->bufend - b->buffer;
+      b->bstop = b->buffer = mp_expand(FB_POOL(b)->mp);
       b->bufend = b->buffer + mp_avail(FB_POOL(b)->mp);
-      b->bstop = b->buffer;
       b->bptr = b->buffer + len;
     }
 }
 
 void
-fbpool_start(struct fbpool *b, struct mempool *mp, uns init_size)
+fbpool_start(struct fbpool *b, struct mempool *mp, size_t init_size)
 {
   b->mp = mp;
   b->fb.buffer = b->fb.bstop = b->fb.bptr = mp_start(mp, init_size);
@@ -40,7 +39,7 @@ fbpool_start(struct fbpool *b, struct mempool *mp, uns init_size)
 void *
 fbpool_end(struct fbpool *b)
 {
-  return mp_end(b->mp, b->fb.bptr); 
+  return mp_end(b->mp, b->fb.bptr);
 }
 
 void
@@ -59,22 +58,22 @@ int main(void)
   struct mempool *mp;
   struct fbpool fb;
   byte *p;
-  uns l;
-  
+  uint l;
+
   mp = mp_new(64);
   fbpool_init(&fb);
   fbpool_start(&fb, mp, 16);
-  for (uns i = 0; i < 1024; i++)
+  for (uint i = 0; i < 1024; i++)
     bprintf(&fb.fb, "<hello>");
   p = fbpool_end(&fb);
   l = mp_size(mp, p);
   if (l != 1024 * 7)
     ASSERT(0);
-  for (uns i = 0; i < 1024; i++)
+  for (uint i = 0; i < 1024; i++)
     if (memcmp(p + i * 7, "<hello>", 7))
       ASSERT(0);
   mp_delete(mp);
-  
+
   return 0;
 }