From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: "Jay Soffian" <jaysoffian@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Björn Gustavsson" <bgustavsson@gmail.com>
Subject: [PATCH 2/4] teach warn_dangling_symref to take a FILE argument
Date: Mon, 9 Nov 2009 23:58:31 -0500 [thread overview]
Message-ID: <1257829113-52168-3-git-send-email-jaysoffian@gmail.com> (raw)
In-Reply-To: <1257829113-52168-2-git-send-email-jaysoffian@gmail.com>
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.
---
builtin-remote.c | 2 +-
refs.c | 7 ++++---
refs.h | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index 0ea4e60..e67b89f 100644
--- 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/"));
- warn_dangling_symref(dangling_msg, refname);
+ warn_dangling_symref(stdout, dangling_msg, refname);
}
free_remote_ref_states(&states);
diff --git a/refs.c b/refs.c
index 808f56b..3e73a0a 100644
--- 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 {
+ FILE *fp;
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;
- printf(d->msg_fmt, refname);
+ fprintf(d->fp, d->msg_fmt, refname);
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);
}
diff --git a/refs.h b/refs.h
index 777b5b7..e141991 100644
--- 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 *);
-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
--
1.6.4.2
next prev parent reply other threads:[~2009-11-10 4:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-10 4:58 [PATCH 0/4] Teach fetch --prune and --dry run options Jay Soffian
2009-11-10 4:58 ` [PATCH 1/4] remote: refactor some logic into get_stale_heads() Jay Soffian
2009-11-10 4:58 ` Jay Soffian [this message]
2009-11-10 4:58 ` [PATCH 3/4] builtin-fetch: add --prune option Jay Soffian
2009-11-10 4:58 ` [PATCH 4/4] builtin-fetch: add --dry-run option Jay Soffian
-- strict thread matches above, loose matches on Subject: below --
2009-11-10 5:03 [PATCH 0/4] Teach fetch --prune and --dry run options Jay Soffian
2009-11-10 5:03 ` [PATCH 1/4] remote: refactor some logic into get_stale_heads() Jay Soffian
2009-11-10 5:03 ` [PATCH 2/4] teach warn_dangling_symref to take a FILE argument Jay Soffian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1257829113-52168-3-git-send-email-jaysoffian@gmail.com \
--to=jaysoffian@gmail.com \
--cc=bgustavsson@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).