X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fsort.c;h=e436f5a08998ed9f772f0b5be30e736d8afa5786;hp=3ab7a474efe51a58ce1b9984a0ae40fc887791b0;hb=HEAD;hpb=17429ef85bfb4bdf51f4a659443fe4c31c972928

diff --git a/src/sort.c b/src/sort.c
index 3ab7a47..e436f5a 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -26,7 +26,6 @@
 #include <err.h>
 
 #include "dhcpd-pools.h"
-#include "defaults.h"
 
 /* Sort functions for range sorting */
 int intcomp(const void *x, const void *y)
@@ -119,7 +118,7 @@ void field_selector(char c)
 	default:
 		warnx("field_selector: unknown sort order `%c'", c);
 		errx(EXIT_FAILURE, "Try `%s --help' for more information.",
-			program_invocation_short_name);
+		     program_invocation_short_name);
 	}
 }
 
@@ -167,6 +166,8 @@ void mergesort_ranges(struct range_t *orig, int size, struct range_t *temp)
 {
 	int left, right, i;
 	struct range_t hold;
+	/* Merge sort split size */
+	static const int MIN_MERGE_SIZE = 8;
 
 	if (size < MIN_MERGE_SIZE) {
 		for (left = 0; left < size; left++) {