Fix calculation of internal sorting buffer and add unification to s-fixint.

[libucw.git] / lib / sort-test.c

diff --git a/lib/sort-test.c b/lib/sort-test.c
index 14f4a65866de59b902b9a308a597ac967ff4c455..c3a48c8c4c1f94ec56274ee06b28c994ae575502 100644 (file)
--- a/lib/sort-test.c
+++ b/lib/sort-test.c
@@ -1,13 +1,12 @@
 /* Test for sorting routines */
 
 #include "lib/lib.h"
 /* Test for sorting routines */
 
 #include "lib/lib.h"

-#include "lib/conf2.h"
+#include "lib/getopt.h"

 #include "lib/fastbuf.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "lib/fastbuf.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

-#include <getopt.h>

 
 struct key {
   char line[4096];
 
 struct key {
   char line[4096];


@@ -79,7 +78,7 @@ int
 main(int argc, char **argv)
 {
   log_init(NULL);
 main(int argc, char **argv)
 {
   log_init(NULL);

-  if (cf_get_opt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 ||
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 ||

       optind != argc - 2)
   {
     fputs("This program supports only the following command-line arguments:\n" CF_USAGE, stderr);
       optind != argc - 2)
   {
     fputs("This program supports only the following command-line arguments:\n" CF_USAGE, stderr);