X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.h;h=f1f0239ae8dac3177855a5919502d287e823353f;hb=7e769f8c4092b9538a497f0846a9165759b1fee2;hp=d5ca3e717ef7709d52ac46c4f3900ec4d5cffca0;hpb=168c1f2ddcb8ce07248b4079b6398afe8c2d792a;p=libucw.git

diff --git a/lib/fastbuf.h b/lib/fastbuf.h
index d5ca3e71..f1f0239a 100644
--- a/lib/fastbuf.h
+++ b/lib/fastbuf.h
@@ -4,6 +4,9 @@
  *	(c) 1997--2000 Martin Mares <mj@ucw.cz>
  */
 
+#ifndef _SHERLOCK_FASTBUF_H
+#define _SHERLOCK_FASTBUF_H
+
 #ifndef EOF
 #include <stdio.h>
 #endif
@@ -66,30 +69,30 @@ void bflush(struct fastbuf *f);
 void bseek(struct fastbuf *f, sh_off_t pos, int whence);
 void bsetpos(struct fastbuf *f, sh_off_t pos);
 
-extern inline sh_off_t btell(struct fastbuf *f)
+static inline sh_off_t btell(struct fastbuf *f)
 {
   return f->pos + (f->bptr - f->buffer);
 }
 
 int bgetc_slow(struct fastbuf *f);
-extern inline int bgetc(struct fastbuf *f)
+static inline int bgetc(struct fastbuf *f)
 {
   return (f->bptr < f->bstop) ? (int) *f->bptr++ : bgetc_slow(f);
 }
 
 int bpeekc_slow(struct fastbuf *f);
-extern inline int bpeekc(struct fastbuf *f)
+static inline int bpeekc(struct fastbuf *f)
 {
   return (f->bptr < f->bstop) ? (int) *f->bptr : bpeekc_slow(f);
 }
 
-extern inline void bungetc(struct fastbuf *f, byte c)
+static inline void bungetc(struct fastbuf *f, byte c)
 {
   *--f->bptr = c;
 }
 
 void bputc_slow(struct fastbuf *f, byte c);
-extern inline void bputc(struct fastbuf *f, byte c)
+static inline void bputc(struct fastbuf *f, byte c)
 {
   if (f->bptr < f->bufend)
     *f->bptr++ = c;
@@ -98,7 +101,7 @@ extern inline void bputc(struct fastbuf *f, byte c)
 }
 
 word bgetw_slow(struct fastbuf *f);
-extern inline word bgetw(struct fastbuf *f)
+static inline word bgetw(struct fastbuf *f)
 {
   word w;
   if (f->bptr + 2 <= f->bstop)
@@ -121,7 +124,7 @@ extern inline word bgetw(struct fastbuf *f)
 }
 
 u32 bgetl_slow(struct fastbuf *f);
-extern inline u32 bgetl(struct fastbuf *f)
+static inline u32 bgetl(struct fastbuf *f)
 {
   u32 l;
   if (f->bptr + 4 <= f->bstop)
@@ -144,7 +147,7 @@ extern inline u32 bgetl(struct fastbuf *f)
 }
 
 u64 bgetq_slow(struct fastbuf *f);
-extern inline u64 bgetq(struct fastbuf *f)
+static inline u64 bgetq(struct fastbuf *f)
 {
   if (f->bptr + 8 <= f->bstop)
     {
@@ -158,7 +161,7 @@ extern inline u64 bgetq(struct fastbuf *f)
 }
 
 u64 bget5_slow(struct fastbuf *f);
-extern inline u64 bget5(struct fastbuf *f)
+static inline u64 bget5(struct fastbuf *f)
 {
   u64 l;
   if (f->bptr + 5 <= f->bstop)
@@ -177,7 +180,7 @@ extern inline u64 bget5(struct fastbuf *f)
 }
 
 void bputw_slow(struct fastbuf *f, word w);
-extern inline void bputw(struct fastbuf *f, word w)
+static inline void bputw(struct fastbuf *f, word w)
 {
   if (f->bptr + 2 <= f->bufend)
     {
@@ -200,7 +203,7 @@ extern inline void bputw(struct fastbuf *f, word w)
 }
 
 void bputl_slow(struct fastbuf *f, u32 l);
-extern inline void bputl(struct fastbuf *f, u32 l)
+static inline void bputl(struct fastbuf *f, u32 l)
 {
   if (f->bptr + 4 <= f->bufend)
     {
@@ -227,7 +230,7 @@ extern inline void bputl(struct fastbuf *f, u32 l)
 }
 
 void bputq_slow(struct fastbuf *f, u64 l);
-extern inline void bputq(struct fastbuf *f, u64 l)
+static inline void bputq(struct fastbuf *f, u64 l)
 {
   if (f->bptr + 8 <= f->bufend)
     {
@@ -239,7 +242,7 @@ extern inline void bputq(struct fastbuf *f, u64 l)
 }
 
 void bput5_slow(struct fastbuf *f, u64 l);
-extern inline void bput5(struct fastbuf *f, u64 l)
+static inline void bput5(struct fastbuf *f, u64 l)
 {
   if (f->bptr + 5 <= f->bufend)
     {
@@ -264,20 +267,21 @@ extern inline void bput5(struct fastbuf *f, u64 l)
     bput5_slow(f, l);
 }
 
-void bread_slow(struct fastbuf *f, void *b, uns l);
-extern inline void bread(struct fastbuf *f, void *b, uns l)
+uns bread_slow(struct fastbuf *f, void *b, uns l);
+static inline uns bread(struct fastbuf *f, void *b, uns l)
 {
   if (f->bptr + l <= f->bstop)
     {
       memcpy(b, f->bptr, l);
       f->bptr += l;
+      return l;
     }
   else
-    bread_slow(f, b, l);
+    return bread_slow(f, b, l);
 }
 
 void bwrite_slow(struct fastbuf *f, void *b, uns l);
-extern inline void bwrite(struct fastbuf *f, void *b, uns l)
+static inline void bwrite(struct fastbuf *f, void *b, uns l)
 {
   if (f->bptr + l <= f->bufend)
     {
@@ -290,19 +294,25 @@ extern inline void bwrite(struct fastbuf *f, void *b, uns l)
 
 byte *bgets(struct fastbuf *f, byte *b, uns l);	/* Non-std */
 
-extern inline void
+static inline void
 bputs(struct fastbuf *f, byte *b)
 {
   bwrite(f, b, strlen(b));
 }
 
-extern inline void
+static inline void
 bputsn(struct fastbuf *f, byte *b)
 {
   bputs(f, b);
   bputc(f, '\n');
 }
 
+/* Direct I/O on buffers */
+
+int bdirect_read(struct fastbuf *f, byte **buf);
+int bdirect_write_prepare(struct fastbuf *f, byte **buf);
+void bdirect_write_commit(struct fastbuf *f, byte *pos);
+
 /* Depending on compile-time configuration, we select the right function for reading/writing of file offsets */
 
 #ifdef SHERLOCK_CONFIG_LARGE_DB
@@ -316,3 +326,5 @@ bputsn(struct fastbuf *f, byte *b)
 #define bgetp(f) bgetl(f)
 #define bputp(f,l) bputl(f,l)
 #endif
+
+#endif