Removed FIXME.

[libucw.git] / lib / sorter.h

diff --git a/lib/sorter.h b/lib/sorter.h
index be2e80a33b12dade3daffafc9683626998d7b5c0..65a9553af1a4f1fc63d43551b82e74360460729c 100644 (file)
--- a/lib/sorter.h
+++ b/lib/sorter.h
@@ -159,7 +159,7 @@ P(pass)(struct fastbuf **fb1, struct fastbuf **fb2)
        {
          P(merge_data)(in1, in2, out1, kin1, kin2);
          SWAP(kin1, kprev1, ktmp);
-         next1 = P(fetch_key)(in1, kin1); /* FIXME: Re-use other code? */
+         next1 = P(fetch_key)(in1, kin1);
          run1 = next1 && (P(compare)(kprev1, kin1) LESS 0);
          SWAP(kin2, kprev2, ktmp);
          next2 = P(fetch_key)(in2, kin2);
@@ -372,14 +372,14 @@ struct fastbuf *fb1, struct fastbuf *fb2
 #ifdef SORT_INPUT_FILE
   struct fastbuf *fb1, *fb2;
   fb1 = bopen(inname, O_RDONLY, sorter_stream_bufsize);
-#ifdef SORT_DELETE_INPUT
-  fb1->is_temp_file = SORT_DELETE_INPUT;
-#endif
   fb2 = NULL;
 #elif defined(SORT_INPUT_FB)
   struct fastbuf *fb2 = NULL;
 #endif
 
+#ifdef SORT_DELETE_INPUT
+  fb1->is_temp_file = SORT_DELETE_INPUT;
+#endif
   sorter_pass_counter = 1;
 #ifdef SORT_PRESORT
   P(presort)(&fb1, &fb2);