X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=server-info.c;h=df19e49b5be75f2cc75e24ba6cda0c94631b434d;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=7b214c8138afa7ff8f3a274235c6be5dac32ef07;hpb=f13d7db4af3bbf611990d63643b34c4e546b127c;p=git.git

diff --git a/server-info.c b/server-info.c
index 7b214c81..df19e49b 100644
--- a/server-info.c
+++ b/server-info.c
@@ -55,30 +55,6 @@ static int num_pack;
 static const char *objdir;
 static int objdirlen;
 
-static struct object *parse_object_cheap(const unsigned char *sha1)
-{
-	struct object *o;
-
-	if ((o = parse_object(sha1)) == NULL)
-		return NULL;
-	if (o->type == commit_type) {
-		struct commit *commit = (struct commit *)o;
-		free(commit->buffer);
-		commit->buffer = NULL;
-	} else if (o->type == tree_type) {
-		struct tree *tree = (struct tree *)o;
-		struct tree_entry_list *e, *n;
-		for (e = tree->entries; e; e = n) {
-			free(e->name);
-			e->name = NULL;
-			n = e->next;
-			free(e);
-		}
-		tree->entries = NULL;
-	}
-	return o;
-}
-
 static struct pack_info *find_pack_by_name(const char *name)
 {
 	int i;
@@ -91,15 +67,6 @@ static struct pack_info *find_pack_by_name(const char *name)
 	return NULL;
 }
 
-static struct pack_info *find_pack_by_old_num(int old_num)
-{
-	int i;
-	for (i = 0; i < num_pack; i++)
-		if (info[i]->old_num == old_num)
-			return info[i];
-	return NULL;
-}
-
 /* Returns non-zero when we detect that the info in the
  * old file is useless.
  */
@@ -173,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)