packed_ref_store: move `packed_refs_path` here

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 87cecde23104fe6535c5f970ef0604672ea6a539..c4b8e2f63b862990e57bc9e78a904d7937fb2a6d 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -47,6 +47,33 @@ struct packed_ref_cache {
        struct stat_validity validity;
 };
 
+/*
+ * A container for `packed-refs`-related data. It is not (yet) a
+ * `ref_store`.
+ */
+struct packed_ref_store {
+       unsigned int store_flags;
+
+       /* The path of the "packed-refs" file: */
+       char *path;
+
+       /*
+        * A cache of the values read from the `packed-refs` file, if
+        * it might still be current; otherwise, NULL.
+        */
+       struct packed_ref_cache *cache;
+};
+
+static struct packed_ref_store *packed_ref_store_create(
+               const char *path, unsigned int store_flags)
+{
+       struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
+
+       refs->store_flags = store_flags;
+       refs->path = xstrdup(path);
+       return refs;
+}
+
 /*
  * Future: need to be in "struct repository"
  * when doing a full libification.
@@ -57,16 +84,16 @@ struct files_ref_store {
 
        char *gitdir;
        char *gitcommondir;
-       char *packed_refs_path;
 
        struct ref_cache *loose;
-       struct packed_ref_cache *packed;
 
        /*
         * Lock used for the "packed-refs" file. Note that this (and
         * thus the enclosing `files_ref_store`) must not be freed.
         */
        struct lock_file packed_refs_lock;
+
+       struct packed_ref_store *packed_ref_store;
 };
 
 /*
@@ -95,12 +122,12 @@ static int release_packed_ref_cache(struct packed_ref_cache *packed_refs)
 
 static void clear_packed_ref_cache(struct files_ref_store *refs)
 {
-       if (refs->packed) {
-               struct packed_ref_cache *packed_refs = refs->packed;
+       if (refs->packed_ref_store->cache) {
+               struct packed_ref_cache *packed_refs = refs->packed_ref_store->cache;
 
                if (is_lock_file_locked(&refs->packed_refs_lock))
                        die("BUG: packed-ref cache cleared while locked");
-               refs->packed = NULL;
+               refs->packed_ref_store->cache = NULL;
                release_packed_ref_cache(packed_refs);
        }
 }
@@ -131,7 +158,8 @@ static struct ref_store *files_ref_store_create(const char *gitdir,
        get_common_dir_noenv(&sb, gitdir);
        refs->gitcommondir = strbuf_detach(&sb, NULL);
        strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
-       refs->packed_refs_path = strbuf_detach(&sb, NULL);
+       refs->packed_ref_store = packed_ref_store_create(sb.buf, flags);
+       strbuf_release(&sb);
 
        return ref_store;
 }
@@ -319,11 +347,6 @@ static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file)
        return packed_refs;
 }
 
-static const char *files_packed_refs_path(struct files_ref_store *refs)
-{
-       return refs->packed_refs_path;
-}
-
 static void files_reflog_path(struct files_ref_store *refs,
                              struct strbuf *sb,
                              const char *refname)
@@ -375,9 +398,9 @@ static void files_ref_path(struct files_ref_store *refs,
  */
 static void validate_packed_ref_cache(struct files_ref_store *refs)
 {
-       if (refs->packed &&
-           !stat_validity_check(&refs->packed->validity,
-                                files_packed_refs_path(refs)))
+       if (refs->packed_ref_store->cache &&
+           !stat_validity_check(&refs->packed_ref_store->cache->validity,
+                                refs->packed_ref_store->path))
                clear_packed_ref_cache(refs);
 }
 
@@ -391,15 +414,15 @@ static void validate_packed_ref_cache(struct files_ref_store *refs)
  */
 static struct packed_ref_cache *get_packed_ref_cache(struct files_ref_store *refs)
 {
-       const char *packed_refs_file = files_packed_refs_path(refs);
+       const char *packed_refs_file = refs->packed_ref_store->path;
 
        if (!is_lock_file_locked(&refs->packed_refs_lock))
                validate_packed_ref_cache(refs);
 
-       if (!refs->packed)
-               refs->packed = read_packed_refs(packed_refs_file);
+       if (!refs->packed_ref_store->cache)
+               refs->packed_ref_store->cache = read_packed_refs(packed_refs_file);
 
-       return refs->packed;
+       return refs->packed_ref_store->cache;
 }
 
 static struct ref_dir *get_packed_ref_dir(struct packed_ref_cache *packed_ref_cache)
@@ -1328,7 +1351,7 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags)
        }
 
        if (hold_lock_file_for_update_timeout(
-                           &refs->packed_refs_lock, files_packed_refs_path(refs),
+                           &refs->packed_refs_lock, refs->packed_ref_store->path,
                            flags, timeout_value) < 0)
                return -1;
 
@@ -1609,7 +1632,7 @@ static int repack_without_refs(struct files_ref_store *refs,
                return 0; /* no refname exists in packed refs */
 
        if (lock_packed_refs(refs, 0)) {
-               unable_to_lock_message(files_packed_refs_path(refs), errno, err);
+               unable_to_lock_message(refs->packed_ref_store->path, errno, err);
                return -1;
        }
        packed = get_packed_refs(refs);