X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbuckettool.c;h=f22f17f90691e53ab164dfb97970f99710fc570b;hb=3b44cc5e0858a329f647bee0617fbab117ea5ea9;hp=f825957e3415b7854045a68c180e85be249cdeec;hpb=fffaac35eb0f0e1d6ced9a88df2a7f3c09548ec7;p=libucw.git

diff --git a/lib/buckettool.c b/lib/buckettool.c
index f825957e..f22f17f9 100644
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -1,7 +1,7 @@
 /*
  *	Sherlock Library -- Bucket Manipulation Tool
  *
- *	(c) 2001 Martin Mares <mj@ucw.cz>
+ *	(c) 2001--2004 Martin Mares <mj@ucw.cz>
  *	(c) 2004 Robert Spalek <robert@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
@@ -15,10 +15,9 @@
 #include "lib/conf.h"
 #include "lib/pools.h"
 #include "lib/object.h"
-#include "lib/buck2obj.h"
-#include "lib/obj2buck.h"
 #include "lib/lizard.h"
-#include "charset/unistream.h"
+#include "lib/bbuf.h"
+#include "lib/ff-utf8.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -141,10 +140,6 @@ extract(char *id)
   obuck_cleanup();
 }
 
-#define	GBUF_TYPE	byte
-#define	GBUF_PREFIX(x)	bb_##x
-#include "lib/gbuf.h"
-
 static void
 insert(byte *arg)
 {