refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
This function was missed in 9939b33d6a
(packed-backend: rip out some
now-unused code, 2017-09-08), and has been orphaned since then. Let's
delete it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
98961e42f0
commit
34e8a20d76
@ -212,41 +212,6 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname)
|
||||
return (entry->flag & REF_DIR) ? NULL : entry;
|
||||
}
|
||||
|
||||
int remove_entry_from_dir(struct ref_dir *dir, const char *refname)
|
||||
{
|
||||
int refname_len = strlen(refname);
|
||||
int entry_index;
|
||||
struct ref_entry *entry;
|
||||
int is_dir = refname[refname_len - 1] == '/';
|
||||
if (is_dir) {
|
||||
/*
|
||||
* refname represents a reference directory. Remove
|
||||
* the trailing slash; otherwise we will get the
|
||||
* directory *representing* refname rather than the
|
||||
* one *containing* it.
|
||||
*/
|
||||
char *dirname = xmemdupz(refname, refname_len - 1);
|
||||
dir = find_containing_dir(dir, dirname, 0);
|
||||
free(dirname);
|
||||
} else {
|
||||
dir = find_containing_dir(dir, refname, 0);
|
||||
}
|
||||
if (!dir)
|
||||
return -1;
|
||||
entry_index = search_ref_dir(dir, refname, refname_len);
|
||||
if (entry_index == -1)
|
||||
return -1;
|
||||
entry = dir->entries[entry_index];
|
||||
|
||||
MOVE_ARRAY(&dir->entries[entry_index],
|
||||
&dir->entries[entry_index + 1], dir->nr - entry_index - 1);
|
||||
dir->nr--;
|
||||
if (dir->sorted > entry_index)
|
||||
dir->sorted--;
|
||||
free_ref_entry(entry);
|
||||
return dir->nr;
|
||||
}
|
||||
|
||||
int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref)
|
||||
{
|
||||
dir = find_containing_dir(dir, ref->name, 1);
|
||||
|
@ -199,22 +199,6 @@ void free_ref_cache(struct ref_cache *cache);
|
||||
*/
|
||||
void add_entry_to_dir(struct ref_dir *dir, struct ref_entry *entry);
|
||||
|
||||
/*
|
||||
* Remove the entry with the given name from dir, recursing into
|
||||
* subdirectories as necessary. If refname is the name of a directory
|
||||
* (i.e., ends with '/'), then remove the directory and its contents.
|
||||
* If the removal was successful, return the number of entries
|
||||
* remaining in the directory entry that contained the deleted entry.
|
||||
* If the name was not found, return -1. Please note that this
|
||||
* function only deletes the entry from the cache; it does not delete
|
||||
* it from the filesystem or ensure that other cache entries (which
|
||||
* might be symbolic references to the removed entry) are updated.
|
||||
* Nor does it remove any containing dir entries that might be made
|
||||
* empty by the removal. dir must represent the top-level directory
|
||||
* and must already be complete.
|
||||
*/
|
||||
int remove_entry_from_dir(struct ref_dir *dir, const char *refname);
|
||||
|
||||
/*
|
||||
* Add a ref_entry to the ref_dir (unsorted), recursing into
|
||||
* subdirectories as necessary. dir must represent the top-level
|
||||
|
Loading…
Reference in New Issue
Block a user