X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=server-info.c;h=6cd38be3291e95e75a7d2348e825d49c8f7ad2af;hb=cf2999eb4cbe39d5a40add574be9e5c019df758b;hp=05bce7da3b4935675465f993c24bb1188439d6d9;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git

diff --git a/server-info.c b/server-info.c
index 05bce7da3..6cd38be32 100644
--- a/server-info.c
+++ b/server-info.c
@@ -7,12 +7,12 @@
 /* refs */
 static FILE *info_ref_fp;
 
-static int add_info_ref(const char *path, const unsigned char *sha1)
+static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
 	struct object *o = parse_object(sha1);
 
 	fprintf(info_ref_fp, "%s	%s\n", sha1_to_hex(sha1), path);
-	if (o->type == tag_type) {
+	if (o->type == OBJ_TAG) {
 		o = deref_tag(o, path, 0);
 		if (o)
 			fprintf(info_ref_fp, "%s	%s^{}\n",
@@ -23,7 +23,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1)
 
 static int update_info_refs(int force)
 {
-	char *path0 = strdup(git_path("info/refs"));
+	char *path0 = xstrdup(git_path("info/refs"));
 	int len = strlen(path0);
 	char *path1 = xmalloc(len + 2);
 
@@ -34,7 +34,7 @@ static int update_info_refs(int force)
 	info_ref_fp = fopen(path1, "w");
 	if (!info_ref_fp)
 		return error("unable to update %s", path0);
-	for_each_ref(add_info_ref);
+	for_each_ref(add_info_ref, NULL);
 	fclose(info_ref_fp);
 	rename(path1, path0);
 	free(path0);
@@ -94,7 +94,7 @@ static int read_pack_info_file(const char *infofile)
 
 	fp = fopen(infofile, "r");
 	if (!fp)
-		return 1; /* nonexisting is not an error. */
+		return 1; /* nonexistent is not an error. */
 
 	while (fgets(line, sizeof(line), fp)) {
 		int len = strlen(line);