autoconf.h needs to be handled differently, since it is copied from obj/lib

[libucw.git] / lib / fastbuf.h

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index 83caf9211c72c9ab7345b10dbc01a7241ef670ea..1589843d5e3ccde0a701004ee893812b9a37c1af 100644 (file)
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -63,7 +63,7 @@ struct fastbuf {
   byte is_fastbuf[0];                  /* Dummy field for checking of type casts */
   byte *bptr, *bstop;                  /* Access pointers */
   byte *buffer, *bufend;               /* Start and end of the buffer */
   byte is_fastbuf[0];                  /* Dummy field for checking of type casts */
   byte *bptr, *bstop;                  /* Access pointers */
   byte *buffer, *bufend;               /* Start and end of the buffer */

-  byte *name;                          /* File name for error messages */
+  char *name;                          /* File name for error messages */

   sh_off_t pos;                                /* Position of bstop in the file */
   int (*refill)(struct fastbuf *);     /* Get a buffer with new data */
   void (*spout)(struct fastbuf *);     /* Write buffer data to the file */
   sh_off_t pos;                                /* Position of bstop in the file */
   int (*refill)(struct fastbuf *);     /* Get a buffer with new data */
   void (*spout)(struct fastbuf *);     /* Write buffer data to the file */


@@ -75,24 +75,24 @@ struct fastbuf {
 
 /* FastIO on standard files (specify buffer size 0 to enable mmaping) */
 
 
 /* FastIO on standard files (specify buffer size 0 to enable mmaping) */
 

-struct fastbuf *bopen(byte *name, uns mode, uns buflen);
-struct fastbuf *bopen_try(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
 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 */
 
 
 /* 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 *fbmem_clone_read(struct fastbuf *);    /* Create reading fastbuf */
 
 /* FastIO on memory mapped files */
 

-struct fastbuf *bopen_mm(byte *name, uns mode);
+struct fastbuf *bopen_mm(const char *name, uns mode);

 
 /* FastI on file descriptors with limit */
 
 
 /* FastI on file descriptors with limit */
 


@@ -124,7 +124,7 @@ struct fb_atomic {
 };
 #define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf)
 
 };
 #define FB_ATOMIC(f) ((struct fb_atomic *)(f)->is_fastbuf)
 

-struct fastbuf *fbatomic_open(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
 void fbatomic_internal_write(struct fastbuf *b);
 
 static inline void


@@ -217,8 +217,8 @@ static inline uns breadb(struct fastbuf *f, void *b, uns l)
     return bread_slow(f, b, l, 1);
 }
 
     return bread_slow(f, b, l, 1);
 }
 

-void bwrite_slow(struct fastbuf *f, void *b, uns l);
-static inline void bwrite(struct fastbuf *f, void *b, uns l)
+void bwrite_slow(struct fastbuf *f, const void *b, uns l);
+static inline void bwrite(struct fastbuf *f, const void *b, uns l)

 {
   if (bavailw(f) >= l)
     {
 {
   if (bavailw(f) >= l)
     {


@@ -229,14 +229,29 @@ static inline void bwrite(struct fastbuf *f, void *b, uns l)
     bwrite_slow(f, b, l);
 }
 
     bwrite_slow(f, b, l);
 }
 

-byte *bgets(struct fastbuf *f, byte *b, uns l);        /* Non-std */
-int bgets_nodie(struct fastbuf *f, byte *b, uns l);
-byte *bgets0(struct fastbuf *f, byte *b, uns l);
+/*
+ *  Functions for reading of strings:
+ *
+ *     bgets()         reads a line, strip the trailing '\n' and return a pointer
+ *                     to the terminating 0 or NULL on EOF. Dies if the line is too long.
+ *     bgets0()                does the same for 0-terminated strings.
+ *     bgets_nodie()   a variant of bgets() which returns either the length of the
+ *                             string (excluding the terminator) or -1 if the line does not fit
+ *                             in the buffer. In such cases, it returns after reading exactly `l'
+ *                             bytes of input.
+ *     bgets_bb()      a variant of bgets() which allocates the string in a growing buffer
+ *     bgets_mp()      the same, but in a mempool
+ *     bgets_stk()     the same, but on the stack by alloca()
+ */
+
+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);
 
 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;
 
 struct bgets_stk_struct {
   struct fastbuf *f;


@@ -248,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
 #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, byte *b)
+bputs(struct fastbuf *f, const char *b)

 {
   bwrite(f, b, strlen(b));
 }
 
 static inline void
 {
   bwrite(f, b, strlen(b));
 }
 
 static inline void

-bputs0(struct fastbuf *f, byte *b)
+bputs0(struct fastbuf *f, const char *b)

 {
   bwrite(f, b, strlen(b)+1);
 }
 
 static inline void
 {
   bwrite(f, b, strlen(b)+1);
 }
 
 static inline void

-bputsn(struct fastbuf *f, byte *b)
+bputsn(struct fastbuf *f, const char *b)

 {
   bputs(f, b);
   bputc(f, '\n');
 {
   bputs(f, b);
   bputc(f, '\n');


@@ -336,7 +351,7 @@ bdirect_write_commit(struct fastbuf *f, byte *pos)
 
 /* Formatted output */
 
 
 /* Formatted output */
 

-int bprintf(struct fastbuf *b, char *msg, ...) FORMAT_CHECK(printf,2,3);
-int vbprintf(struct fastbuf *b, char *msg, va_list args);
+int bprintf(struct fastbuf *b, const char *msg, ...) FORMAT_CHECK(printf,2,3);
+int vbprintf(struct fastbuf *b, const char *msg, va_list args);

 
 #endif
 
 #endif