Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / sorter.c

diff --git a/lib/sorter.c b/lib/sorter.c
index bda973e5d7887e8013b8885ea105ac33ba330295..20db9ef1974e3b86ea9866b1f303bcad63534df6 100644 (file)
--- a/lib/sorter.c
+++ b/lib/sorter.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Universal Sorter
+ *     UCW Library -- Universal Sorter
  *
  *     (c) 2001--2002 Martin Mares <mj@ucw.cz>
  *
@@ -8,30 +8,6 @@
  */
 
 #include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/fastbuf.h"
-
-#include <unistd.h>
-#include <sys/fcntl.h>
-
-#define SORT_DECLARE_ONLY
-#include "lib/sorter.h"
-
-uns sorter_trace;
-uns sorter_presort_bufsize = 65536;
-uns sorter_stream_bufsize = 65536;
-
-static struct cfitem sorter_config[] = {
-  { "Sorter",          CT_SECTION,     NULL },
-  { "Trace",           CT_INT,         &sorter_trace },
-  { "PresortBuffer",   CT_INT,         &sorter_presort_bufsize },
-  { "StreamBuffer",    CT_INT,         &sorter_stream_bufsize },
-  { NULL,              CT_STOP,        NULL }
-};
-
-static void CONSTRUCTOR sorter_init_config(void)
-{
-  cf_register(sorter_config);
-}
+#include "lib/sorter-globals.h"
 
 uns sorter_pass_counter;