development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refs: use name "prefix" consistently

Browse source 
In the context of the for_each_ref() functions, call the prefix that
references must start with "prefix". (In some places it was called
"base".) This is clearer, and also prevents confusion with another
planned use of the word "base".

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2016-06-18 06:15:09 +02:00 committed by Junio C Hamano
parent 067622b0e8
commit 4633a846f5
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
refs/files-backend.c
View file

@ -542,7 +542,7 @@ static struct ref_entry *current_ref;
typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data); typedef int each_ref_entry_fn(struct ref_entry *entry, void *cb_data);
struct ref_entry_cb { struct ref_entry_cb {
const char *base; const char *prefix;
int trim; int trim;
int flags; int flags;
each_ref_fn *fn; each_ref_fn *fn;
@ -559,7 +559,7 @@ static int do_one_ref(struct ref_entry *entry, void *cb_data)
struct ref_entry *old_current_ref; struct ref_entry *old_current_ref;
int retval; int retval;
if (!starts_with(entry->name, data->base)) if (!starts_with(entry->name, data->prefix))
return 0; return 0;
if (!(data->flags & DO_FOR_EACH_INCLUDE_BROKEN) && if (!(data->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
@ -1824,12 +1824,12 @@ int peel_ref(const char *refname, unsigned char *sha1)
/* /*
* Call fn for each reference in the specified ref_cache, omitting * Call fn for each reference in the specified ref_cache, omitting
* references not in the containing_dir of base. fn is called for all * references not in the containing_dir of prefix. Call fn for all
* references, including broken ones. If fn ever returns a non-zero * references, including broken ones. If fn ever returns a non-zero
* value, stop the iteration and return that value; otherwise, return * value, stop the iteration and return that value; otherwise, return
* 0. * 0.
*/ */
static int do_for_each_entry(struct ref_cache *refs, const char *base, static int do_for_each_entry(struct ref_cache *refs, const char *prefix,
each_ref_entry_fn fn, void *cb_data) each_ref_entry_fn fn, void *cb_data)
{ {
struct packed_ref_cache *packed_ref_cache; struct packed_ref_cache *packed_ref_cache;
@ -1846,8 +1846,8 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,
* disk. * disk.
*/ */
loose_dir = get_loose_refs(refs); loose_dir = get_loose_refs(refs);
if (base && *base) { if (prefix && *prefix) {
loose_dir = find_containing_dir(loose_dir, base, 0); loose_dir = find_containing_dir(loose_dir, prefix, 0);
} }
if (loose_dir) if (loose_dir)
prime_ref_dir(loose_dir); prime_ref_dir(loose_dir);
@ -1855,8 +1855,8 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,
packed_ref_cache = get_packed_ref_cache(refs); packed_ref_cache = get_packed_ref_cache(refs);
acquire_packed_ref_cache(packed_ref_cache); acquire_packed_ref_cache(packed_ref_cache);
packed_dir = get_packed_ref_dir(packed_ref_cache); packed_dir = get_packed_ref_dir(packed_ref_cache);
if (base && *base) { if (prefix && *prefix) {
packed_dir = find_containing_dir(packed_dir, base, 0); packed_dir = find_containing_dir(packed_dir, prefix, 0);
} }
if (packed_dir && loose_dir) { if (packed_dir && loose_dir) {
@ -1878,14 +1878,14 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base,
return retval; return retval;
} }
int do_for_each_ref(const char *submodule, const char *base, int do_for_each_ref(const char *submodule, const char *prefix,
each_ref_fn fn, int trim, int flags, void *cb_data) each_ref_fn fn, int trim, int flags, void *cb_data)
{ {
struct ref_entry_cb data; struct ref_entry_cb data;
struct ref_cache *refs; struct ref_cache *refs;
refs = get_ref_cache(submodule); refs = get_ref_cache(submodule);
data.base = base; data.prefix = prefix;
data.trim = trim; data.trim = trim;
data.flags = flags; data.flags = flags;
data.fn = fn; data.fn = fn;
@ -1896,7 +1896,7 @@ int do_for_each_ref(const char *submodule, const char *base,
if (ref_paranoia) if (ref_paranoia)
data.flags |= DO_FOR_EACH_INCLUDE_BROKEN; data.flags |= DO_FOR_EACH_INCLUDE_BROKEN;
return do_for_each_entry(refs, base, do_one_ref, &data); return do_for_each_entry(refs, prefix, do_one_ref, &data);
} }
/* /*

14
refs/refs-internal.h
View file

@ -250,16 +250,16 @@ int rename_ref_available(const char *oldname, const char *newname);
/* /*
* Call fn for each reference in the specified submodule for which the * Call fn for each reference in the specified submodule for which the
* refname begins with base. If trim is non-zero, then trim that many * refname begins with prefix. If trim is non-zero, then trim that
* characters off the beginning of each refname before passing the * many characters off the beginning of each refname before passing
* refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to include * the refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to
* broken references in the iteration. If fn ever returns a non-zero * include broken references in the iteration. If fn ever returns a
* value, stop the iteration and return that value; otherwise, return * non-zero value, stop the iteration and return that value;
* 0. * otherwise, return 0.
* *
* This is the common backend for the for_each_*ref* functions. * This is the common backend for the for_each_*ref* functions.
*/ */
int do_for_each_ref(const char *submodule, const char *base, int do_for_each_ref(const char *submodule, const char *prefix,
each_ref_fn fn, int trim, int flags, void *cb_data); each_ref_fn fn, int trim, int flags, void *cb_data);
/* /*