teach warn_dangling_symref to take a FILE argument
Different callers of warn_dangling_symref() may want to control whether its output goes to stdout or stderr so let it take a FILE argument. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jay Soffian committed
Nov 10, 2009 at 00:03 UTC
3cf6134ad016712ecb78186d9079b9cff7b25416
3 files changed
+6
-5
builtin-remote.c
+1
-1
@@ -1166,7 +1166,7 @@ static int prune_remote(const char *remote, int dry_run)
1166
1167
printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
1168
abbrev_ref(refname, "refs/remotes/"));
1169
- warn_dangling_symref(dangling_msg, refname);
1169
+ warn_dangling_symref(stdout, dangling_msg, refname);
1170
}
1171
1172
free_remote_ref_states(&states);
refs.c
+4
-3
@@ -286,6 +286,7 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
286
}
287
288
struct warn_if_dangling_data {
289
+ FILE *fp;
290
const char *refname;
291
const char *msg_fmt;
292
};
@@ -304,13 +305,13 @@ static int warn_if_dangling_symref(const char *refname, const unsigned char *sha
305
if (!resolves_to || strcmp(resolves_to, d->refname))
306
return 0;
307
307
- printf(d->msg_fmt, refname);
308
+ fprintf(d->fp, d->msg_fmt, refname);
309
return 0;
310
}
311
311
-void warn_dangling_symref(const char *msg_fmt, const char *refname)
312
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
313
{
313
- struct warn_if_dangling_data data = { refname, msg_fmt };
314
+ struct warn_if_dangling_data data = { fp, refname, msg_fmt };
315
for_each_rawref(warn_if_dangling_symref, &data);
316
}
317
refs.h
+1
-1
@@ -29,7 +29,7 @@ extern int for_each_replace_ref(each_ref_fn, void *);
29
/* can be used to learn about broken ref and symref */
30
extern int for_each_rawref(each_ref_fn, void *);
31
32
-extern void warn_dangling_symref(const char *msg_fmt, const char *refname);
32
+extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
33
34
/*
35
* Extra refs will be listed by for_each_ref() before any actual refs