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>
This commit is contained in:

committed by
Junio C Hamano

parent
1b7ba794d2
commit
910650d2f8
@ -1677,21 +1677,21 @@ static int filter_pattern_match(struct ref_filter *filter, const char *refname)
|
||||
* the need to parse the object via parse_object(). peel_ref() might be a
|
||||
* more efficient alternative to obtain the pointee.
|
||||
*/
|
||||
static const struct object_id *match_points_at(struct sha1_array *points_at,
|
||||
static const struct object_id *match_points_at(struct oid_array *points_at,
|
||||
const struct object_id *oid,
|
||||
const char *refname)
|
||||
{
|
||||
const struct object_id *tagged_oid = NULL;
|
||||
struct object *obj;
|
||||
|
||||
if (sha1_array_lookup(points_at, oid) >= 0)
|
||||
if (oid_array_lookup(points_at, oid) >= 0)
|
||||
return oid;
|
||||
obj = parse_object(oid->hash);
|
||||
if (!obj)
|
||||
die(_("malformed object at '%s'"), refname);
|
||||
if (obj->type == OBJ_TAG)
|
||||
tagged_oid = &((struct tag *)obj)->tagged->oid;
|
||||
if (tagged_oid && sha1_array_lookup(points_at, tagged_oid) >= 0)
|
||||
if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
|
||||
return tagged_oid;
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user