fastbufs: byte * -> char *

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 7ec5ec6f2ca993fd91fe6d1951260950ddee3460..55f3d72b3dd884c8f31b2e4cc3cab1ff74c30862 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -75,24 +75,24 @@ struct fastbuf {
 
 /* FastIO on standard files (specify buffer size 0 to enable mmaping) */
 
-struct fastbuf *bopen(const byte *name, uns mode, uns buflen);
-struct fastbuf *bopen_try(const byte *name, uns mode, uns buflen);
+struct fastbuf *bopen(const char *name, uns mode, uns buflen);
+struct fastbuf *bopen_try(const char *name, uns mode, uns buflen);
 struct fastbuf *bopen_tmp(uns buflen);
 struct fastbuf *bfdopen(int fd, uns buflen);
 struct fastbuf *bfdopen_shared(int fd, uns buflen);
 void bfilesync(struct fastbuf *b);
 
 #define TEMP_FILE_NAME_LEN 256
-void temp_file_name(byte *name);
+void temp_file_name(char *name);
 
 /* FastIO on in-memory streams */
 
-struct fastbuf *fbmem_create(unsigned blocksize);      /* Create stream and return its writing fastbuf */
+struct fastbuf *fbmem_create(uns blocksize);           /* Create stream and return its writing fastbuf */
 struct fastbuf *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 
 /* FastIO on memory mapped files */
 
-struct fastbuf *bopen_mm(const byte *name, uns mode);
+struct fastbuf *bopen_mm(const char *name, uns mode);
 
 /* FastI on file descriptors with limit */
 
@@ -124,7 +124,7 @@ struct fb_atomic {
 };
 #define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf)
 
-struct fastbuf *fbatomic_open(const byte *name, struct fastbuf *master, uns bufsize, int record_len);
+struct fastbuf *fbatomic_open(const char *name, struct fastbuf *master, uns bufsize, int record_len);
 void fbatomic_internal_write(struct fastbuf *b);
 
 static inline void
@@ -244,14 +244,14 @@ static inline void bwrite(struct fastbuf *f, const void *b, uns l)
  *     bgets_stk()     the same, but on the stack by alloca()
  */
 
-byte *bgets(struct fastbuf *f, byte *b, uns l);
-byte *bgets0(struct fastbuf *f, byte *b, uns l);
-int bgets_nodie(struct fastbuf *f, byte *b, uns l);
+char *bgets(struct fastbuf *f, char *b, uns l);
+char *bgets0(struct fastbuf *f, char *b, uns l);
+int bgets_nodie(struct fastbuf *f, char *b, uns l);
 
 struct mempool;
 struct bb_t;
 uns bgets_bb(struct fastbuf *f, struct bb_t *b, uns limit);
-byte *bgets_mp(struct fastbuf *f, struct mempool *mp);
+char *bgets_mp(struct fastbuf *f, struct mempool *mp);
 
 struct bgets_stk_struct {
   struct fastbuf *f;
@@ -263,19 +263,19 @@ void bgets_stk_step(struct bgets_stk_struct *s);
 #define bgets_stk(fb) ({ struct bgets_stk_struct _s; _s.f = (fb); for (bgets_stk_init(&_s); _s.cur_len; _s.cur_buf = alloca(_s.cur_len), bgets_stk_step(&_s)); _s.cur_buf; })
 
 static inline void
-bputs(struct fastbuf *f, const byte *b)
+bputs(struct fastbuf *f, const char *b)
 {
   bwrite(f, b, strlen(b));
 }
 
 static inline void
-bputs0(struct fastbuf *f, const byte *b)
+bputs0(struct fastbuf *f, const char *b)
 {
   bwrite(f, b, strlen(b)+1);
 }
 
 static inline void
-bputsn(struct fastbuf *f, const byte *b)
+bputsn(struct fastbuf *f, const char *b)
 {
   bputs(f, b);
   bputc(f, '\n');

diff --git a/lib/fb-atomic.c b/lib/fb-atomic.c
index c578a951bb118c17fb8b21d161c0905574ece012..234d920ddf6f6295aa01c551a0df1354fa52e550 100644 (file)
--- a/lib/fb-atomic.c
+++ b/lib/fb-atomic.c
@@ -103,7 +103,7 @@ fbatomic_close(struct fastbuf *f)
 }
 
 struct fastbuf *
-fbatomic_open(const byte *name, struct fastbuf *master, uns bufsize, int record_len)
+fbatomic_open(const char *name, struct fastbuf *master, uns bufsize, int record_len)
 {
   struct fb_atomic *F = xmalloc_zero(sizeof(*F));
   struct fastbuf *f = &F->fb;

diff --git a/lib/fb-file.c b/lib/fb-file.c
index dd8d14886a6872e4fa74bd0a8add456467d93492..04f2f4cf444442141fcfb3b4e74d5e852a9f1a99 100644 (file)
--- a/lib/fb-file.c
+++ b/lib/fb-file.c
@@ -92,7 +92,7 @@ bfd_config(struct fastbuf *f, uns item, int value)
 }
 
 static struct fastbuf *
-bfdopen_internal(int fd, uns buflen, const byte *name)
+bfdopen_internal(int fd, uns buflen, const char *name)
 {
   int namelen = strlen(name) + 1;
   struct fb_file *F = xmalloc(sizeof(struct fb_file) + buflen + namelen);
@@ -115,7 +115,7 @@ bfdopen_internal(int fd, uns buflen, const byte *name)
 }
 
 struct fastbuf *
-bopen_try(const byte *name, uns mode, uns buflen)
+bopen_try(const char *name, uns mode, uns buflen)
 {
   int fd = sh_open(name, mode, 0666);
   if (fd < 0)
@@ -127,7 +127,7 @@ bopen_try(const byte *name, uns mode, uns buflen)
 }
 
 struct fastbuf *
-bopen(const byte *name, uns mode, uns buflen)
+bopen(const char *name, uns mode, uns buflen)
 {
   if (!buflen)
     return bopen_mm(name, mode);

diff --git a/lib/fb-mmap.c b/lib/fb-mmap.c
index 28e90df47ca10b9afdfe70cce0f87f6b610deed0..3a82a92accec38459d934f85538d227daf98b691 100644 (file)
--- a/lib/fb-mmap.c
+++ b/lib/fb-mmap.c
@@ -166,7 +166,7 @@ bfmm_config(struct fastbuf *f, uns item, int value)
 }
 
 static struct fastbuf *
-bfmmopen_internal(int fd, const byte *name, uns mode)
+bfmmopen_internal(int fd, const char *name, uns mode)
 {
   int namelen = strlen(name) + 1;
   struct fb_mmap *F = xmalloc(sizeof(struct fb_mmap) + namelen);
@@ -190,7 +190,7 @@ bfmmopen_internal(int fd, const byte *name, uns mode)
 }
 
 struct fastbuf *
-bopen_mm(const byte *name, uns mode)
+bopen_mm(const char *name, uns mode)
 {
   int fd;
 

diff --git a/lib/fb-temp.c b/lib/fb-temp.c
index 4bcced6c4ecd56c5d3bac1064845807a09cd5917..2c359e8a62430410e8646feb72ba4c6d26c0bb84 100644 (file)
--- a/lib/fb-temp.c
+++ b/lib/fb-temp.c
@@ -31,7 +31,7 @@ static void CONSTRUCTOR temp_global_init(void)
 }
 
 void
-temp_file_name(byte *buf)
+temp_file_name(char *buf)
 {
   struct ucwlib_context *ctx = ucwlib_thread_context();
   int cnt = ++ctx->temp_counter;

diff --git a/lib/ff-string.c b/lib/ff-string.c
index c8fa0fb35b48cc06a4bc44c6ee4280af5587f2ff..913c33535599d46531f86f880530728be2044bfd 100644 (file)
--- a/lib/ff-string.c
+++ b/lib/ff-string.c
@@ -13,8 +13,8 @@
 #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;
@@ -47,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;
@@ -76,7 +76,7 @@ bgets_nodie(struct fastbuf *f, byte *b, uns l)
   while (src_len);
 exit:
   *b++ = 0;
-  return b - start;
+  return b - (char *)start;
 }
 
 uns
@@ -128,7 +128,7 @@ exit:
   return buf - bb->ptr;
 }
 
-byte *
+char *
 bgets_mp(struct fastbuf *f, struct mempool *mp)
 {
   byte *src;
@@ -253,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;