Added a graph-like test case which tests custom presorter and THIS_FB mode.

[libucw.git] / lib / fastbuf.c

diff --git a/lib/fastbuf.c b/lib/fastbuf.c
index 9a1cd4a5f265ff68511580f009159b5cd3d3e776..980d53aa619ceb0509d64987ef57765dc8f42199 100644 (file)
--- a/lib/fastbuf.c
+++ b/lib/fastbuf.c
@@ -1,7 +1,7 @@
 /*
  *     UCW Library -- Fast Buffered I/O
  *
- *     (c) 1997--2005 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2006 Martin Mares <mj@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
@@ -9,7 +9,6 @@
 
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
-#include "lib/mempool.h"
 
 #include <stdlib.h>
 
@@ -85,112 +84,6 @@ void bputc_slow(struct fastbuf *f, uns c)
   *f->bptr++ = c;
 }
 
-int bgetw_slow(struct fastbuf *f)
-{
-  int w1, w2;
-  w1 = bgetc_slow(f);
-  if (w1 < 0)
-    return w1;
-  w2 = bgetc_slow(f);
-  if (w2 < 0)
-    return w2;
-#ifdef CPU_BIG_ENDIAN
-  return (w1 << 8) | w2;
-#else
-  return w1 | (w2 << 8);
-#endif
-}
-
-u32 bgetl_slow(struct fastbuf *f)
-{
-  u32 l = bgetc_slow(f);
-#ifdef CPU_BIG_ENDIAN
-  l = (l << 8) | bgetc_slow(f);
-  l = (l << 8) | bgetc_slow(f);
-  return (l << 8) | bgetc_slow(f);
-#else
-  l = (bgetc_slow(f) << 8) | l;
-  l = (bgetc_slow(f) << 16) | l;
-  return (bgetc_slow(f) << 24) | l;
-#endif
-}
-
-u64 bgetq_slow(struct fastbuf *f)
-{
-  u32 l, h;
-#ifdef CPU_BIG_ENDIAN
-  h = bgetl_slow(f);
-  l = bgetl_slow(f);
-#else
-  l = bgetl_slow(f);
-  h = bgetl_slow(f);
-#endif
-  return ((u64) h << 32) | l;
-}
-
-u64 bget5_slow(struct fastbuf *f)
-{
-  u32 l, h;
-#ifdef CPU_BIG_ENDIAN
-  h = bgetc_slow(f);
-  l = bgetl_slow(f);
-#else
-  l = bgetl_slow(f);
-  h = bgetc_slow(f);
-#endif
-  return ((u64) h << 32) | l;
-}
-
-void bputw_slow(struct fastbuf *f, uns w)
-{
-#ifdef CPU_BIG_ENDIAN
-  bputc_slow(f, w >> 8);
-  bputc_slow(f, w);
-#else
-  bputc_slow(f, w);
-  bputc_slow(f, w >> 8);
-#endif
-}
-
-void bputl_slow(struct fastbuf *f, u32 l)
-{
-#ifdef CPU_BIG_ENDIAN
-  bputc_slow(f, l >> 24);
-  bputc_slow(f, l >> 16);
-  bputc_slow(f, l >> 8);
-  bputc_slow(f, l);
-#else
-  bputc_slow(f, l);
-  bputc_slow(f, l >> 8);
-  bputc_slow(f, l >> 16);
-  bputc_slow(f, l >> 24);
-#endif
-}
-
-void bputq_slow(struct fastbuf *f, u64 q)
-{
-#ifdef CPU_BIG_ENDIAN
-  bputl_slow(f, q >> 32);
-  bputl_slow(f, q);
-#else
-  bputl_slow(f, q);
-  bputl_slow(f, q >> 32);
-#endif
-}
-
-void bput5_slow(struct fastbuf *f, u64 o)
-{
-  u32 hi = o >> 32;
-  u32 low = o;
-#ifdef CPU_BIG_ENDIAN
-  bputc_slow(f, hi);
-  bputl_slow(f, low);
-#else
-  bputl_slow(f, low);
-  bputc_slow(f, hi);
-#endif
-}
-
 uns bread_slow(struct fastbuf *f, void *b, uns l, uns check)
 {
   uns total = 0;
@@ -238,135 +131,6 @@ void bwrite_slow(struct fastbuf *f, void *b, uns l)
     }
 }
 
-byte *                                 /* Non-standard */
-bgets(struct fastbuf *f, byte *b, uns l)
-{
-  byte *e = b + l - 1;
-  int k;
-
-  k = bgetc(f);
-  if (k < 0)
-    return NULL;
-  while (b < e)
-    {
-      if (k == '\n' || k < 0)
-       {
-         *b = 0;
-         return b;
-       }
-      *b++ = k;
-      k = bgetc(f);
-    }
-  die("%s: Line too long", f->name);
-}
-
-int
-bgets_nodie(struct fastbuf *f, byte *b, uns l)
-{
-  byte *start = b;
-  byte *e = b + l - 1;
-  int k;
-
-  k = bgetc(f);
-  if (k < 0)
-    return 0;
-  while (b < e)
-    {
-      if (k == '\n' || k < 0)
-       {
-         *b++ = 0;
-         return b - start;
-       }
-      *b++ = k;
-      k = bgetc(f);
-    }
-  return -1;
-}
-
-uns
-bgets_bb(struct fastbuf *f, bb_t *b)
-{
-  for (uns l = 0;; l++)
-    {
-      int k = bgetc(f);
-      byte *p = bb_grow(b, l + 1) + l;
-      if (k == '\n' || k < 0)
-       {
-         *p = 0;
-         return l;
-       }
-      *p = k;
-    }
-}
-
-byte *
-bgets_mp(struct mempool *mp, struct fastbuf *f)
-{
-  uns len = 256, l = 0;
-  byte *buf = alloca(len);
-  for (;;)
-    {
-      while (l < len)
-        {
-          int k = bgetc(f);
-          if (k == '\n' || k < 0)
-           {
-             byte *result = mp_alloc(mp, l + 1);
-             memcpy(result, buf, l);
-             result[l] = 0;
-             return result;
-           }
-         buf[l++] = k;
-        }
-      byte *old_buf = buf;
-      uns old_len = len;
-      len *= 2;
-      buf = alloca(len);
-      memcpy(buf, old_buf, old_len);
-    }
-}
-
-int
-bgets_stk_step(struct fastbuf *f, byte *old_buf, byte *buf, uns len)
-{
-  if (old_buf)
-    {
-      len = len >> 1;
-      memcpy(buf, old_buf, len);
-      buf += len;
-    }
-  while (len--)
-    {
-      int k = bgetc(f);
-      if (k == '\n' || k < 0)
-       return *buf = 0;
-      *buf++ = k;
-    }
-  return 1;
-}
-
-byte *
-bgets0(struct fastbuf *f, byte *b, uns l)
-{
-  byte *e = b + l - 1;
-  int k;
-
-  k = bgetc(f);
-  if (k < 0)
-    return NULL;
-  while (b < e)
-    {
-      if (k <= 0)
-       {
-         *b = 0;
-         return b;
-       }
-      *b++ = k;
-      k = bgetc(f);
-    }
-  die("%s: Line too long", f->name);
-}
-
 void
 bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l)
 {