diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-31 03:40:00 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-31 17:33:56 +0200 |
commit | 910650d2f8755359ab7b1f0e2a2d576c06a68091 (patch) | |
tree | c0ebaef3c66710ea08e1c766ec1553f0105fcc21 /sha1_name.c | |
parent | Convert sha1_array_for_each_unique and for_each_abbrev to object_id (diff) | |
download | git-910650d2f8755359ab7b1f0e2a2d576c06a68091.tar.xz git-910650d2f8755359ab7b1f0e2a2d576c06a68091.zip |
Rename sha1_array to oid_array
Since this structure handles an array of object IDs, rename it to struct
oid_array. Also rename the accessor functions and the initialization
constant.
This commit was produced mechanically by providing non-Documentation
files to the following Perl one-liners:
perl -pi -E 's/struct sha1_array/struct oid_array/g'
perl -pi -E 's/\bsha1_array_/oid_array_/g'
perl -pi -E 's/SHA1_ARRAY_INIT/OID_ARRAY_INIT/g'
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r-- | sha1_name.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1_name.c b/sha1_name.c index a9501fb964..323dd34c63 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -426,13 +426,13 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1, static int collect_ambiguous(const struct object_id *oid, void *data) { - sha1_array_append(data, oid); + oid_array_append(data, oid); return 0; } int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) { - struct sha1_array collect = SHA1_ARRAY_INIT; + struct oid_array collect = OID_ARRAY_INIT; struct disambiguate_state ds; int ret; @@ -445,8 +445,8 @@ int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) find_short_object_filename(&ds); find_short_packed_object(&ds); - ret = sha1_array_for_each_unique(&collect, fn, cb_data); - sha1_array_clear(&collect); + ret = oid_array_for_each_unique(&collect, fn, cb_data); + oid_array_clear(&collect); return ret; } |