warn_if_dangling_symref(): convert local variable "junk" to object_id

mhagger · gitster · commit 4e675d17320a · 2015-05-25T12:19:39.000-07:00
Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -1757,7 +1757,7 @@ int ref_exists(const char *refname)
 }
 
 static int filter_refs(const char *refname, const struct object_id *oid,
-		       int flags, void *data)
+			   int flags, void *data)
 {
 	struct ref_filter *filter = (struct ref_filter *)data;
 
@@ -1903,12 +1903,12 @@ static int warn_if_dangling_symref(const char *refname, const struct object_id *
 {
 	struct warn_if_dangling_data *d = cb_data;
 	const char *resolves_to;
-	unsigned char junk[20];
+	struct object_id junk;
 
 	if (!(flags & REF_ISSYMREF))
 		return 0;
 
-	resolves_to = resolve_ref_unsafe(refname, 0, junk, NULL);
+	resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
 	if (!resolves_to
 	    || (d->refname
 		? strcmp(resolves_to, d->refname)

Original file line number	Diff line number	Diff line change
`@@ -1757,7 +1757,7 @@ int ref_exists(const char *refname)`
`1757`	`1757`	`}`
`1758`	`1758`
`1759`	`1759`	`static int filter_refs(const char refname, const struct object_id oid,`
`1760`		`- int flags, void *data)`
	`1760`	`+ int flags, void *data)`
`1761`	`1761`	`{`
`1762`	`1762`	`struct ref_filter filter = (struct ref_filter )data;`
`1763`	`1763`
`@@ -1903,12 +1903,12 @@ static int warn_if_dangling_symref(const char refname, const struct object_id `
`1903`	`1903`	`{`
`1904`	`1904`	`struct warn_if_dangling_data *d = cb_data;`
`1905`	`1905`	`const char *resolves_to;`
`1906`		`- unsigned char junk[20];`
	`1906`	`+ struct object_id junk;`
`1907`	`1907`
`1908`	`1908`	`if (!(flags & REF_ISSYMREF))`
`1909`	`1909`	`return 0;`
`1910`	`1910`
`1911`		`- resolves_to = resolve_ref_unsafe(refname, 0, junk, NULL);`
	`1911`	`+ resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);`
`1912`	`1912`	`if (!resolves_to`
`1913`	`1913`	`\|\| (d->refname`
`1914`	`1914`	`? strcmp(resolves_to, d->refname)`