Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-sorter

[libucw.git] / lib / ff-string.c

diff --git a/lib/ff-string.c b/lib/ff-string.c
index cb41b8c7c0f5ffa73a23f1b229f7f9874af433e9..913c33535599d46531f86f880530728be2044bfd 100644 (file)
--- a/lib/ff-string.c
+++ b/lib/ff-string.c
@@ -11,9 +11,10 @@
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 #include "lib/mempool.h"
+#include "lib/bbuf.h"
 
-byte *                                 /* Non-standard */
-bgets(struct fastbuf *f, byte *b, uns l)
+char *                                 /* Non-standard */
+bgets(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src;
@@ -46,7 +47,7 @@ exit:
 }
 
 int
-bgets_nodie(struct fastbuf *f, byte *b, uns l)
+bgets_nodie(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src, *start = b;
@@ -75,11 +76,11 @@ bgets_nodie(struct fastbuf *f, byte *b, uns l)
   while (src_len);
 exit:
   *b++ = 0;
-  return b - start;
+  return b - (char *)start;
 }
 
 uns
-bgets_bb(struct fastbuf *f, bb_t *bb, uns limit)
+bgets_bb(struct fastbuf *f, struct bb_t *bb, uns limit)
 {
   ASSERT(limit);
   byte *src;
@@ -127,7 +128,7 @@ exit:
   return buf - bb->ptr;
 }
 
-byte *
+char *
 bgets_mp(struct fastbuf *f, struct mempool *mp)
 {
   byte *src;
@@ -252,8 +253,8 @@ exit:
   s->cur_len = 0;
 }
 
-byte *
-bgets0(struct fastbuf *f, byte *b, uns l)
+char *
+bgets0(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src;