Removed xprintf() -- it was very ugly and its only raison d'etre was

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

diff --git a/lib/sort-test.c b/lib/sort-test.c
index 0ce1acf46bde57e35024ca99dd0b2b48a0fafb70..448abdc31b517fe72e0b39e0c64898613b005a96 100644 (file)
--- a/lib/sort-test.c
+++ b/lib/sort-test.c
@@ -59,13 +59,13 @@ s_store_item(struct fastbuf *f, struct key *k)
 
 #ifdef SORT_UNIFY
 static inline void
-s_merge_data(struct fastbuf *src1, struct fastbuf *src2, struct fastbuf *dest, struct key *k1, struct key *k2)
+s_merge_data(struct fastbuf *src1 UNUSED, struct fastbuf *src2 UNUSED, struct fastbuf *dest, struct key *k1, struct key *k2 UNUSED)
 {
   s_copy_data(NULL, dest, k1);
 }
 
 static inline struct key *
-s_merge_items(struct key *a, struct key *b)
+s_merge_items(struct key *a, struct key *b UNUSED)
 {
   return a;
 }
@@ -77,10 +77,12 @@ int
 main(int argc, char **argv)
 {
   log_init(NULL);
-  cf_read(DEFAULT_CONFIG);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 ||
       optind != argc - 2)
-    die("Usage: sort-test <input> <output>");
+  {
+    fputs("This program supports only the following command-line arguments:\n" CF_USAGE, stderr);
+    exit(1);
+  }
 
   s_sort(argv[optind], argv[optind+1]);
   return 0;