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>

diff --git a/builtin-remote.c b/builtin-remote.c
index b48267bc7bd712595f7a47082fa4adce4f75b9cf..56cd5af93359276b0117629ba451164e3826305a 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -1166,7 +1166,7 @@ static int prune_remote(const char *remote, int dry_run)
 
                printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
                       abbrev_ref(refname, "refs/remotes/"));
 
                printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
                       abbrev_ref(refname, "refs/remotes/"));

-               warn_dangling_symref(dangling_msg, refname);
+               warn_dangling_symref(stdout, dangling_msg, refname);

        }
 
        free_remote_ref_states(&states);
        }
 
        free_remote_ref_states(&states);

diff --git a/refs.c b/refs.c
index 808f56bb27b6ece616f400154fe98c9cef12f8ba..3e73a0a36dbea4046e5b7b0550b2f4bb67539439 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -286,6 +286,7 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
 }
 
 struct warn_if_dangling_data {
 }
 
 struct warn_if_dangling_data {

+       FILE *fp;

        const char *refname;
        const char *msg_fmt;
 };
        const char *refname;
        const char *msg_fmt;
 };


@@ -304,13 +305,13 @@ static int warn_if_dangling_symref(const char *refname, const unsigned char *sha
        if (!resolves_to || strcmp(resolves_to, d->refname))
                return 0;
 
        if (!resolves_to || strcmp(resolves_to, d->refname))
                return 0;
 

-       printf(d->msg_fmt, refname);
+       fprintf(d->fp, d->msg_fmt, refname);

        return 0;
 }
 
        return 0;
 }
 

-void warn_dangling_symref(const char *msg_fmt, const char *refname)
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)

 {
 {

-       struct warn_if_dangling_data data = { refname, msg_fmt };
+       struct warn_if_dangling_data data = { fp, refname, msg_fmt };

        for_each_rawref(warn_if_dangling_symref, &data);
 }
 
        for_each_rawref(warn_if_dangling_symref, &data);
 }
 

diff --git a/refs.h b/refs.h
index 777b5b7ca6c08ef63f44abbf0236fc180cb9c6d1..e141991851be60334ea23cc6055b329c36cd272f 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -29,7 +29,7 @@ extern int for_each_replace_ref(each_ref_fn, void *);
 /* can be used to learn about broken ref and symref */
 extern int for_each_rawref(each_ref_fn, void *);
 
 /* can be used to learn about broken ref and symref */
 extern int for_each_rawref(each_ref_fn, void *);
 

-extern void warn_dangling_symref(const char *msg_fmt, const char *refname);
+extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);

 
 /*
  * Extra refs will be listed by for_each_ref() before any actual refs
 
 /*
  * Extra refs will be listed by for_each_ref() before any actual refs