git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: Ronnie Sahlberg <sahlberg@google.com>,
	David Turner <dturner@twitter.com>
Subject: [PATCH 10/43] refs.c: move warn_if_dangling_symref* to the common code
Date: Wed,  2 Sep 2015 21:54:40 -0400	[thread overview]
Message-ID: <1441245313-11907-11-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1441245313-11907-1-git-send-email-dturner@twopensource.com>

From: Ronnie Sahlberg <sahlberg@google.com>

These functions do not use any backend specific code so we move
them to the common code.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twitter.com>
---
 refs-be-files.c | 52 ----------------------------------------------------
 refs.c          | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/refs-be-files.c b/refs-be-files.c
index 4f0e3c7..9c0dd5c 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -1953,58 +1953,6 @@ int peel_ref(const char *refname, unsigned char *sha1)
 	return peel_object(base, sha1);
 }
 
-struct warn_if_dangling_data {
-	FILE *fp;
-	const char *refname;
-	const struct string_list *refnames;
-	const char *msg_fmt;
-};
-
-static int warn_if_dangling_symref(const char *refname, const struct object_id *oid,
-				   int flags, void *cb_data)
-{
-	struct warn_if_dangling_data *d = cb_data;
-	const char *resolves_to;
-	struct object_id junk;
-
-	if (!(flags & REF_ISSYMREF))
-		return 0;
-
-	resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
-	if (!resolves_to
-	    || (d->refname
-		? strcmp(resolves_to, d->refname)
-		: !string_list_has_string(d->refnames, resolves_to))) {
-		return 0;
-	}
-
-	fprintf(d->fp, d->msg_fmt, refname);
-	fputc('\n', d->fp);
-	return 0;
-}
-
-void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
-{
-	struct warn_if_dangling_data data;
-
-	data.fp = fp;
-	data.refname = refname;
-	data.refnames = NULL;
-	data.msg_fmt = msg_fmt;
-	for_each_rawref(warn_if_dangling_symref, &data);
-}
-
-void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames)
-{
-	struct warn_if_dangling_data data;
-
-	data.fp = fp;
-	data.refname = NULL;
-	data.refnames = refnames;
-	data.msg_fmt = msg_fmt;
-	for_each_rawref(warn_if_dangling_symref, &data);
-}
-
 /*
  * Call fn for each reference in the specified ref_cache, omitting
  * references not in the containing_dir of base.  fn is called for all
diff --git a/refs.c b/refs.c
index 310b7f5..24d5e28 100644
--- a/refs.c
+++ b/refs.c
@@ -581,3 +581,55 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
 	free(short_name);
 	return xstrdup(refname);
 }
+
+struct warn_if_dangling_data {
+	FILE *fp;
+	const char *refname;
+	const struct string_list *refnames;
+	const char *msg_fmt;
+};
+
+static int warn_if_dangling_symref(const char *refname, const struct object_id *oid,
+				   int flags, void *cb_data)
+{
+	struct warn_if_dangling_data *d = cb_data;
+	const char *resolves_to;
+	struct object_id junk;
+
+	if (!(flags & REF_ISSYMREF))
+		return 0;
+
+	resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
+	if (!resolves_to
+	    || (d->refname
+		? strcmp(resolves_to, d->refname)
+		: !string_list_has_string(d->refnames, resolves_to))) {
+		return 0;
+	}
+
+	fprintf(d->fp, d->msg_fmt, refname);
+	fputc('\n', d->fp);
+	return 0;
+}
+
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
+{
+	struct warn_if_dangling_data data;
+
+	data.fp = fp;
+	data.refname = refname;
+	data.refnames = NULL;
+	data.msg_fmt = msg_fmt;
+	for_each_rawref(warn_if_dangling_symref, &data);
+}
+
+void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames)
+{
+	struct warn_if_dangling_data data;
+
+	data.fp = fp;
+	data.refname = NULL;
+	data.refnames = refnames;
+	data.msg_fmt = msg_fmt;
+	for_each_rawref(warn_if_dangling_symref, &data);
+}
-- 
2.0.4.315.gad8727a-twtrsrc

  parent reply	other threads:[~2015-09-03  1:58 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-03  1:54 [PATCH 00/43] refs lmdb backend David Turner
2015-09-03  1:54 ` [PATCH 01/43] refs.c: create a public version of verify_refname_available David Turner
2015-09-03 23:08   ` Junio C Hamano
2015-09-04 15:45     ` David Turner
2015-09-03  1:54 ` [PATCH 02/43] refs: make repack_without_refs and is_branch public David Turner
2015-09-03  1:54 ` [PATCH 04/43] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-09-03  1:54 ` [PATCH 05/43] refs.c: move update_ref to refs.c David Turner
2015-09-03  1:54 ` [PATCH 06/43] refs.c: move delete_ref and delete_refs to the common code David Turner
2015-09-03  1:54 ` [PATCH 07/43] refs.c: move read_ref_at to the common refs file David Turner
2015-09-03  1:54 ` [PATCH 08/43] refs.c: move the hidden refs functions to the common code David Turner
2015-09-03  1:54 ` [PATCH 09/43] refs.c: move dwim and friend functions to the common refs code David Turner
2015-09-03  1:54 ` David Turner [this message]
2015-09-03  1:54 ` [PATCH 11/43] refs.c: move read_ref, read_ref_full and ref_exists to the common code David Turner
2015-09-03  1:54 ` [PATCH 12/43] refs.c: move resolve_refdup to common David Turner
2015-09-03  1:54 ` [PATCH 13/43] refs.c: move check_refname_format to the common code David Turner
2015-09-03  1:54 ` [PATCH 14/43] refs.c: move is_branch " David Turner
2015-09-03  1:54 ` [PATCH 15/43] refs.c: move prettify_refname " David Turner
2015-09-03  1:54 ` [PATCH 16/43] refs.c: move ref iterators " David Turner
2015-09-03  1:54 ` [PATCH 17/43] refs.c: move head_ref_namespaced " David Turner
2015-09-03  1:54 ` [PATCH 18/43] refs-be-files.c: add a backend method structure with transaction functions David Turner
2015-09-03  1:54 ` [PATCH 19/43] refs-be-files.c: add methods for misc ref operations David Turner
2015-09-03  1:54 ` [PATCH 20/43] refs-be-files.c: add methods for the ref iterators David Turner
2015-09-25 20:54   ` Junio C Hamano
2015-09-25 21:28     ` David Turner
2015-09-25 21:33       ` Junio C Hamano
2015-09-03  1:54 ` [PATCH 21/43] refs-be-files.c: add method for for_each_reftype_ David Turner
2015-09-03  1:54 ` [PATCH 22/43] refs-be-files.c: add do_for_each_per_worktree_ref David Turner
2015-09-03  1:54 ` [PATCH 23/43] refs.c: move refname_is_safe to the common code David Turner
2015-09-03  1:54 ` [PATCH 24/43] refs.h: document make refname_is_safe and add it to header David Turner
2015-09-03  2:06   ` David Turner
2015-09-03  1:54 ` [PATCH 25/43] refs.c: move copy_msg to the common code David Turner
2015-09-03  1:54 ` [PATCH 26/43] refs.c: move peel_object " David Turner
2015-09-03  1:54 ` [PATCH 27/43] refs.c: move should_autocreate_reflog to " David Turner
2015-09-03  1:54 ` [PATCH 28/43] refs.c: add ref backend init function David Turner
2015-09-03  1:54 ` [PATCH 29/43] refs.c: add methods for reflog David Turner
2015-09-03  1:55 ` [PATCH 30/43] refs.c: add method for initial ref transaction commit David Turner
2015-09-03  1:55 ` [PATCH 31/43] initdb: move safe_create_dir into common code David Turner
2015-09-03  1:55 ` [PATCH 32/43] refs.c: add method for initializing refs db David Turner
2015-09-03  1:55 ` [PATCH 33/43] refs.c: make struct ref_transaction generic David Turner
2015-09-03  1:55 ` [PATCH 34/43] refs-be-files.c: add method to rename refs David Turner
2015-09-03  1:55 ` [PATCH 35/43] refs-be-files.c: add method to expire reflogs David Turner
2015-09-03  1:55 ` [PATCH 36/43] run-command: track total number of commands run David Turner
2015-09-03  1:55 ` [PATCH 37/43] refs: move some defines from refs-be-files.c to refs.h David Turner
2015-09-03  1:55 ` [PATCH 38/43] refs: make some files backend functions public David Turner
2015-09-03  1:55 ` [PATCH 39/43] refs: break out a ref conflict check David Turner
2015-09-03  1:55 ` [PATCH 40/43] refs: allow ref backend to be set for clone David Turner
2015-09-03  1:55 ` [PATCH 41/43] refs: add register_refs_backend David Turner
2015-09-03  1:55 ` [PATCH 42/43] refs: add LMDB refs backend David Turner
2015-09-03 23:16   ` Junio C Hamano
2015-09-03  1:55 ` [PATCH 43/43] refs: tests for db backend David Turner
2015-09-03 23:10 ` [PATCH 00/43] refs lmdb backend Junio C Hamano
2015-09-04 16:01   ` David Turner
2015-09-17  0:09     ` David Turner
2015-09-17 16:33       ` Junio C Hamano

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=1441245313-11907-11-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=dturner@twitter.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    --cc=sahlberg@google.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).