Rather more optimal data comparator -- compare data lengths first then, if they're equal, compare the actual data.

svn path=/trunk/libparserutils/; revision=4856

1 files changed, 4 insertions, 4 deletions

diff --git a/src/utils/dict.c b/src/utils/dict.c
index e84b9b9..17b94a5 100644
--- a/src/utils/dict.c
+++ b/src/utils/dict.c
@@ -197,11 +197,11 @@ int dict_cmp(const void *a, const void *b)
 {
 	const parserutils_dict_entry *aa = (const parserutils_dict_entry *) a;
 	const parserutils_dict_entry *bb = (const parserutils_dict_entry *) b;
-	size_t min_len = min(aa->len, bb->len);
-	int result = 0;
+	int result = aa->len - bb->len;
 
-	if ((result = memcmp(aa->data, bb->data, min_len)) == 0) {
-		result = aa->len - bb->len;
+	/* Sort first by length, and then by data equality */
+	if (result == 0) {
+		result = memcmp(aa->data, bb->data, aa->len);
 	}
 
 	return result;