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
14
sha1-array.c
14
sha1-array.c
@ -2,7 +2,7 @@
|
||||
#include "sha1-array.h"
|
||||
#include "sha1-lookup.h"
|
||||
|
||||
void sha1_array_append(struct sha1_array *array, const struct object_id *oid)
|
||||
void oid_array_append(struct oid_array *array, const struct object_id *oid)
|
||||
{
|
||||
ALLOC_GROW(array->oid, array->nr + 1, array->alloc);
|
||||
oidcpy(&array->oid[array->nr++], oid);
|
||||
@ -14,7 +14,7 @@ static int void_hashcmp(const void *a, const void *b)
|
||||
return oidcmp(a, b);
|
||||
}
|
||||
|
||||
static void sha1_array_sort(struct sha1_array *array)
|
||||
static void oid_array_sort(struct oid_array *array)
|
||||
{
|
||||
QSORT(array->oid, array->nr, void_hashcmp);
|
||||
array->sorted = 1;
|
||||
@ -26,14 +26,14 @@ static const unsigned char *sha1_access(size_t index, void *table)
|
||||
return array[index].hash;
|
||||
}
|
||||
|
||||
int sha1_array_lookup(struct sha1_array *array, const struct object_id *oid)
|
||||
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
|
||||
{
|
||||
if (!array->sorted)
|
||||
sha1_array_sort(array);
|
||||
oid_array_sort(array);
|
||||
return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
|
||||
}
|
||||
|
||||
void sha1_array_clear(struct sha1_array *array)
|
||||
void oid_array_clear(struct oid_array *array)
|
||||
{
|
||||
free(array->oid);
|
||||
array->oid = NULL;
|
||||
@ -42,14 +42,14 @@ void sha1_array_clear(struct sha1_array *array)
|
||||
array->sorted = 0;
|
||||
}
|
||||
|
||||
int sha1_array_for_each_unique(struct sha1_array *array,
|
||||
int oid_array_for_each_unique(struct oid_array *array,
|
||||
for_each_oid_fn fn,
|
||||
void *data)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!array->sorted)
|
||||
sha1_array_sort(array);
|
||||
oid_array_sort(array);
|
||||
|
||||
for (i = 0; i < array->nr; i++) {
|
||||
int ret;
|
||||
|
||||
Reference in New Issue
Block a user