From: Michael Haggerty Date: Fri, 01 May 2015 12:25:46 GMT Subject: [PATCH 06/18] report_refname_conflict(): inline function Message-ID: <1430483158-14349-7-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1430483158-14349-1-git-send-email-mhagger@alum.mit.edu> It wasn't pulling its weight. And we are about to need code similar to this where no ref_entry is available and with more diverse error messages. Rather than try to generalize the function, just inline it. Signed-off-by: Michael Haggerty --- refs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/refs.c b/refs.c index e9c9146..f1da87b 100644 --- a/refs.c +++ b/refs.c @@ -862,12 +862,6 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata) return 1; } -static void report_refname_conflict(struct ref_entry *entry, - const char *refname) -{ - error("'%s' exists; cannot create '%s'", entry->name, refname); -} - /* * Return true iff a reference named refname could be created without * conflicting with the name of an existing reference in dir. If @@ -915,7 +909,7 @@ static int is_refname_available(const char *refname, */ return 1; } - report_refname_conflict(entry, refname); + error("'%s' exists; cannot create '%s'", entry->name, refname); return 0; } @@ -956,7 +950,7 @@ static int is_refname_available(const char *refname, if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) return 1; - report_refname_conflict(data.found, refname); + error("'%s' exists; cannot create '%s'", data.found->name, refname); return 0; } -- 2.1.4