X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fsorter%2Fconfig.c;h=7bc435884b2bd5054d43bfed6728da97d00c4306;hb=959566090f98dd31eaa67d3d5959b641e5fe902b;hp=4b3bd921efeca4683308327294d9dc416b8583e1;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/ucw/sorter/config.c b/ucw/sorter/config.c
index 4b3bd921..7bc43588 100644
--- a/ucw/sorter/config.c
+++ b/ucw/sorter/config.c
@@ -7,21 +7,21 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/conf.h"
-#include "ucw/fastbuf.h"
-#include "ucw/sorter/common.h"
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/fastbuf.h>
+#include <ucw/sorter/common.h>
 
-uns sorter_trace;
-uns sorter_trace_array;
+uint sorter_trace;
+uint sorter_trace_array;
 u64 sorter_bufsize = 65536;
-uns sorter_debug;
-uns sorter_min_radix_bits;
-uns sorter_max_radix_bits;
-uns sorter_add_radix_bits;
-uns sorter_min_multiway_bits;
-uns sorter_max_multiway_bits;
-uns sorter_threads;
+uint sorter_debug;
+uint sorter_min_radix_bits;
+uint sorter_max_radix_bits;
+uint sorter_add_radix_bits;
+uint sorter_min_multiway_bits;
+uint sorter_max_multiway_bits;
+uint sorter_threads;
 u64 sorter_thread_threshold = 1048576;
 u64 sorter_thread_chunk = 4096;
 u64 sorter_radix_threshold = 4096;
@@ -31,19 +31,19 @@ u64 sorter_small_input;
 
 static struct cf_section sorter_config = {
   CF_ITEMS {
-    CF_UNS("Trace", &sorter_trace),
-    CF_UNS("TraceArray", &sorter_trace_array),
+    CF_UINT("Trace", &sorter_trace),
+    CF_UINT("TraceArray", &sorter_trace_array),
     CF_SECTION("FileAccess", &sorter_fb_params, &fbpar_cf),
     CF_SECTION("SmallFileAccess", &sorter_fb_params, &fbpar_cf),
     CF_U64("SmallInput", &sorter_small_input),
     CF_U64("SortBuffer", &sorter_bufsize),
-    CF_UNS("Debug", &sorter_debug),
-    CF_UNS("MinRadixBits", &sorter_min_radix_bits),
-    CF_UNS("MaxRadixBits", &sorter_max_radix_bits),
-    CF_UNS("AddRadixBits", &sorter_add_radix_bits),
-    CF_UNS("MinMultiwayBits", &sorter_min_multiway_bits),
-    CF_UNS("MaxMultiwayBits", &sorter_max_multiway_bits),
-    CF_UNS("Threads", &sorter_threads),
+    CF_UINT("Debug", &sorter_debug),
+    CF_UINT("MinRadixBits", &sorter_min_radix_bits),
+    CF_UINT("MaxRadixBits", &sorter_max_radix_bits),
+    CF_UINT("AddRadixBits", &sorter_add_radix_bits),
+    CF_UINT("MinMultiwayBits", &sorter_min_multiway_bits),
+    CF_UINT("MaxMultiwayBits", &sorter_max_multiway_bits),
+    CF_UINT("Threads", &sorter_threads),
     CF_U64("ThreadThreshold", &sorter_thread_threshold),
     CF_U64("ThreadChunk", &sorter_thread_chunk),
     CF_U64("RadixThreshold", &sorter_radix_threshold),