Commit Diff

Commit:
c60ec51d0a6cf6349f4f437d0c865860981b2069
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
simplify cert sorting No need to overly-optimize this: since mergesort() is not standard and can fail, just use qsort().
Actions:
Patch | Tree
commit - fc63839cd43f440da32bbccd9c24d96f1776a406
commit + c60ec51d0a6cf6349f4f437d0c865860981b2069
blob - fb54ae0bb70aaf765f0789790c05fe8452d8cfc6
blob + 7c560ca2bfddea37d1bcbaa6485e0630239c07ae
--- certs.c
+++ certs.c
@@ -219,15 +219,8 @@ certs_init(const char *certfile)
 		return (-1);
 	}
 
-	/*
-	 * Data should already be in order, so mergesort should be
-	 * faster.  If it fails (memory scarcity), fall back to qsort()
-	 * which is in place.
-	 */
-	if (mergesort(cert_store.certs, cert_store.len,
-	    sizeof(*cert_store.certs), certs_cmp) == -1)
-		qsort(cert_store.certs, cert_store.len,
-		    sizeof(*cert_store.certs), certs_cmp);
+	qsort(cert_store.certs, cert_store.len, sizeof(*cert_store.certs),
+	    certs_cmp);
 
 	fclose(fp);
 	free(line);