From 9c172de1f5e43327d355c0ce54545ef194afd1c6 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 26 Jul 2016 21:52:30 +0200 Subject: msort: don't let fileorder fallback --- msort.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'msort.c') diff --git a/msort.c b/msort.c index 0a1848d..9e21fb3 100644 --- a/msort.c +++ b/msort.c @@ -209,11 +209,7 @@ fileorder(const void *a, const void *b) struct mail *ia = (struct mail *)a; struct mail *ib = (struct mail *)b; - int x = mystrverscmp(a, b); - - if (x != 0) - return x; - return ia->idx - ib->idx; // XXX verify + return mystrverscmp(ia->file, ib->file); } int @@ -222,7 +218,12 @@ idxorder(const void *a, const void *b) struct mail *ia = (struct mail *)a; struct mail *ib = (struct mail *)b; - return ia->idx - ib->idx; // XXX verify + if (ia->idx > ib->idx) + return 1; + else if (ia->idx < ib->idx) + return -1; + else + return 0; } void -- cgit 1.4.1