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

[libucw.git] / lib / sorter.c

diff --git a/lib/sorter.c b/lib/sorter.c
index b43672f4b99d10e090a4450e9338fe69c233ea46..2424bf46dcabfb30d90f06d24dfd325f486479b8 100644 (file)
--- a/lib/sorter.c
+++ b/lib/sorter.c
@@ -1,7 +1,10 @@
 /*
- *     Sherlock Library -- Universal Sorter
+ *     UCW Library -- Universal Sorter
  *
- *     (c) 2001 Martin Mares <mj@ucw.cz>
+ *     (c) 2001--2002 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
@@ -17,33 +20,19 @@
 uns sorter_trace;
 uns sorter_presort_bufsize = 65536;
 uns sorter_stream_bufsize = 65536;
-static byte *sorter_template = "/tmp/sort%d.%d";
 
-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 },
-  { "TempLate",                CT_STRING,      &sorter_template },
-  { NULL,              CT_STOP,        NULL }
+static struct cf_section sorter_config = {
+  CF_ITEMS {
+    CF_UNS("Trace", &sorter_trace),
+    CF_UNS("PresortBuffer", &sorter_presort_bufsize),
+    CF_UNS("StreamBuffer", &sorter_stream_bufsize),
+    CF_END
+  }
 };
 
 static void CONSTRUCTOR sorter_init_config(void)
 {
-  cf_register(sorter_config);
+  cf_declare_section("Sorter", &sorter_config, 0);
 }
 
 uns sorter_pass_counter;
-uns sorter_file_counter;
-
-struct fastbuf *
-sorter_open_tmp(void)
-{
-  byte buf[256];
-  struct fastbuf *f;
-
-  sprintf(buf, sorter_template, (int) getpid(), sorter_file_counter++);
-  f = bopen(buf, O_RDWR | O_CREAT | O_EXCL, sorter_stream_bufsize);
-  f->is_temp_file = 1;
-  return f;
-}