Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive

diff --git a/sha1-array.c b/sha1-array.c
index 82a7f4435c51c0b8e9a2222a95cc679d6f4dcc14..7d646ab5b8cf80e47c6c1f339affeaa76a41d2d2 100644 (file)
--- a/sha1-array.c
+++ b/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;