From: Junio C Hamano <junkio@cox.net>
Date: Fri, 9 Dec 2005 01:29:11 +0000 (-0800)
Subject: qsort(): ptrdiff_t may be larger than int
X-Git-Tag: v0.99.9m^2~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2dee581667d62d113605e97de0beda6a9dbca153;p=git.git

qsort(): ptrdiff_t may be larger than int

This is a companion patch to e23eff8be92a2a2cb66b53deef020063cff285ed
commit.  The same logic, the same rationale that a comparison
function that returns an int should not just compute a ptrdiff_t
and return it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/server-info.c b/server-info.c
index 7d7bcb218..df19e49b5 100644
--- a/server-info.c
+++ b/server-info.c
@@ -140,7 +140,12 @@ static int compare_info(const void *a_, const void *b_)
 		return 1;
 
 	/* then it does not matter but at least keep the comparison stable */
-	return (*a)->p - (*b)->p;
+	if ((*a)->p == (*b)->p)
+		return 0;
+	else if ((*a)->p < (*b)->p)
+		return -1;
+	else
+		return 1;
 }
 
 static void init_pack_info(const char *infofile, int force)