Merged with v3.8

[libucw.git] / lib / sorter.h

diff --git a/lib/sorter.h b/lib/sorter.h
index c33103dda48a4696807a76318968d8489f5aa2ad..15ff9bf7b16bc0378b8231a579cd7035ea8dd088 100644 (file)
--- a/lib/sorter.h
+++ b/lib/sorter.h
@@ -279,7 +279,7 @@ P(presort)(struct fastbuf **fb1, struct fastbuf **fb2)
   struct fastbuf *tbuf;
   uns buf_items = sorter_presort_bufsize / sizeof(SORT_KEY);
   uns run_count = 0;
-  SORT_KEY last_out, *array;
+  SORT_KEY last_out = { }, *array;
 
   ASSERT(!*fb2);
   if (buf_items < 2)
@@ -304,7 +304,7 @@ P(presort)(struct fastbuf **fb1, struct fastbuf **fb2)
        {
          run_count++;
 #ifdef SORT_UP_TO
-         if (sorter_presort_bufsize < SORT_UP_TO)
+         if (sorter_presort_bufsize < (uns) SORT_UP_TO)
 #endif
            SWAP(out1, out2, tbuf);
          if (!out1)