refs.c: remove unlock_ref/close_ref/commit_ref from the refs api

unlock|close|commit_ref can be made static since there are no more external
callers.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 4b27a1ba8ec152b6c893d1575a80b2e8562d3363..bf152aab32d2fee0fc51335850a71a93f207b0d8 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2090,6 +2090,16 @@ int refname_match(const char *abbrev_name, const char *full_name)
        return 0;
 }
 
        return 0;
 }
 

+static void unlock_ref(struct ref_lock *lock)
+{
+       /* Do not free lock->lk -- atexit() still looks at them */
+       if (lock->lk)
+               rollback_lock_file(lock->lk);
+       free(lock->ref_name);
+       free(lock->orig_ref_name);
+       free(lock);
+}
+

 /* This function should make sure errno is meaningful on error */
 static struct ref_lock *verify_lock(struct ref_lock *lock,
        const unsigned char *old_sha1, int mustexist)
 /* This function should make sure errno is meaningful on error */
 static struct ref_lock *verify_lock(struct ref_lock *lock,
        const unsigned char *old_sha1, int mustexist)


@@ -2888,7 +2898,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
        return 1;
 }
 
        return 1;
 }
 

-int close_ref(struct ref_lock *lock)
+static int close_ref(struct ref_lock *lock)

 {
        if (close_lock_file(lock->lk))
                return -1;
 {
        if (close_lock_file(lock->lk))
                return -1;


@@ -2896,7 +2906,7 @@ int close_ref(struct ref_lock *lock)
        return 0;
 }
 
        return 0;
 }
 

-int commit_ref(struct ref_lock *lock)
+static int commit_ref(struct ref_lock *lock)

 {
        if (commit_lock_file(lock->lk))
                return -1;
 {
        if (commit_lock_file(lock->lk))
                return -1;


@@ -2904,16 +2914,6 @@ int commit_ref(struct ref_lock *lock)
        return 0;
 }
 
        return 0;
 }
 

-void unlock_ref(struct ref_lock *lock)
-{
-       /* Do not free lock->lk -- atexit() still looks at them */
-       if (lock->lk)
-               rollback_lock_file(lock->lk);
-       free(lock->ref_name);
-       free(lock->orig_ref_name);
-       free(lock);
-}
-

 /*
  * copy the reflog message msg to buf, which has been allocated sufficiently
  * large, while cleaning up the whitespaces.  Especially, convert LF to space,
 /*
  * copy the reflog message msg to buf, which has been allocated sufficiently
  * large, while cleaning up the whitespaces.  Especially, convert LF to space,

diff --git a/refs.h b/refs.h
index 99e707b1b6a79dbfbc4a55ade74cd576450fd874..4bb58b96868389c45f7af021bf29b754ecc6d7ea 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -198,15 +198,6 @@ extern struct ref_lock *lock_any_ref_for_update(const char *refname,
                                                const unsigned char *old_sha1,
                                                int flags, int *type_p);
 
                                                const unsigned char *old_sha1,
                                                int flags, int *type_p);
 

-/** Close the file descriptor owned by a lock and return the status */
-extern int close_ref(struct ref_lock *lock);
-
-/** Close and commit the ref locked by the lock */
-extern int commit_ref(struct ref_lock *lock);
-
-/** Release any lock taken but not written. **/
-extern void unlock_ref(struct ref_lock *lock);
-

 /*
  * Setup reflog before using. Set errno to something meaningful on failure.
  */
 /*
  * Setup reflog before using. Set errno to something meaningful on failure.
  */