From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v3 12/16] refs.c: make the *_packed_refs functions static
Date: Fri, 7 Nov 2014 11:39:01 -0800 [thread overview]
Message-ID: <1415389145-6391-13-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1415389145-6391-1-git-send-email-sahlberg@google.com>
We no longer need to expose the lock/add/commit/rollback functions
for packed refs anymore so make them static and remove them from the
public api.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 8 ++++----
refs.h | 30 ------------------------------
2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/refs.c b/refs.c
index 2c6b0f6..eee9a14 100644
--- a/refs.c
+++ b/refs.c
@@ -1229,7 +1229,7 @@ static struct ref_dir *get_packed_refs(struct ref_cache *refs)
return get_packed_ref_dir(get_packed_ref_cache(refs));
}
-void add_packed_ref(const char *refname, const unsigned char *sha1)
+static void add_packed_ref(const char *refname, const unsigned char *sha1)
{
struct packed_ref_cache *packed_ref_cache =
get_packed_ref_cache(&ref_cache);
@@ -2398,7 +2398,7 @@ static int write_packed_entry_fn(struct ref_entry *entry, void *cb_data)
}
/* This should return a meaningful errno on failure */
-int lock_packed_refs(int flags)
+static int lock_packed_refs(int flags)
{
struct packed_ref_cache *packed_ref_cache;
@@ -2421,7 +2421,7 @@ int lock_packed_refs(int flags)
* Commit the packed refs changes.
* On error we must make sure that errno contains a meaningful value.
*/
-int commit_packed_refs(void)
+static int commit_packed_refs(void)
{
struct packed_ref_cache *packed_ref_cache =
get_packed_ref_cache(&ref_cache);
@@ -2450,7 +2450,7 @@ int commit_packed_refs(void)
return error;
}
-void rollback_packed_refs(void)
+static void rollback_packed_refs(void)
{
struct packed_ref_cache *packed_ref_cache =
get_packed_ref_cache(&ref_cache);
diff --git a/refs.h b/refs.h
index ce290b1..70a2819 100644
--- a/refs.h
+++ b/refs.h
@@ -120,36 +120,6 @@ extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refn
extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames);
/*
- * Lock the packed-refs file for writing. Flags is passed to
- * hold_lock_file_for_update(). Return 0 on success.
- * Errno is set to something meaningful on error.
- */
-extern int lock_packed_refs(int flags);
-
-/*
- * Add a reference to the in-memory packed reference cache. This may
- * only be called while the packed-refs file is locked (see
- * lock_packed_refs()). To actually write the packed-refs file, call
- * commit_packed_refs().
- */
-extern void add_packed_ref(const char *refname, const unsigned char *sha1);
-
-/*
- * Write the current version of the packed refs cache from memory to
- * disk. The packed-refs file must already be locked for writing (see
- * lock_packed_refs()). Return zero on success.
- * Sets errno to something meaningful on error.
- */
-extern int commit_packed_refs(void);
-
-/*
- * Rollback the lockfile for the packed-refs file, and discard the
- * in-memory packed reference cache. (The packed-refs file will be
- * read anew if it is needed again after this function is called.)
- */
-extern void rollback_packed_refs(void);
-
-/*
* Flags for controlling behaviour of pack_refs()
* PACK_REFS_PRUNE: Prune loose refs after packing
* PACK_REFS_ALL: Pack _all_ refs, not just tags and already packed refs
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-11-07 19:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 19:38 [PATCH v3 00/16] ref-transaction-rename Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 01/16] refs.c: allow passing raw git_committer_info as email to _update_reflog Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 02/16] refs.c: return error instead of dying when locking fails during transaction Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 03/16] refs.c: use packed refs when deleting refs during a transaction Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 04/16] refs.c: use a stringlist for repack_without_refs Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 05/16] refs.c: add transaction support for renaming a reflog Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 06/16] refs.c: update rename_ref to use a transaction Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 07/16] refs.c: rollback the lockfile before we die() in repack_without_refs Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 08/16] refs.c: move reflog updates into its own function Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 09/16] refs.c: write updates to packed refs when a transaction has more than one ref Ronnie Sahlberg
2014-11-07 19:38 ` [PATCH v3 10/16] remote.c: use a transaction for deleting refs Ronnie Sahlberg
2014-11-07 19:39 ` [PATCH v3 11/16] refs.c: make repack_without_refs static Ronnie Sahlberg
2014-11-07 19:39 ` Ronnie Sahlberg [this message]
2014-11-07 19:39 ` [PATCH v3 13/16] refs.c: replace the onerr argument in update_ref with a strbuf err Ronnie Sahlberg
2014-11-07 19:39 ` [PATCH v3 14/16] refs.c: make add_packed_ref return an error instead of calling die Ronnie Sahlberg
2014-11-07 19:39 ` [PATCH v3 15/16] refs.c: make lock_packed_refs take an err argument Ronnie Sahlberg
2014-11-07 19:39 ` [PATCH v3 16/16] refs.c: add an err argument to pack_refs Ronnie Sahlberg
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=1415389145-6391-13-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/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).