From aeb4a51ef82c71c9a65d11f77aeedb53bea0e983 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 25 May 2013 11:08:08 +0200 Subject: [PATCH] object_array: add function object_array_filter() Add a function that allows unwanted entries in an object_array to be removed. This encapsulation is a step towards giving object_array ownership of its entries' name memory. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- object.c | 16 ++++++++++++++++ object.h | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/object.c b/object.c index 20703f52ed..fcd4a82c13 100644 --- a/object.c +++ b/object.c @@ -278,6 +278,22 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj array->nr = ++nr; } +void object_array_filter(struct object_array *array, + object_array_each_func_t want, void *cb_data) +{ + unsigned nr = array->nr, src, dst; + struct object_array_entry *objects = array->objects; + + for (src = dst = 0; src < nr; src++) { + if (want(&objects[src], cb_data)) { + if (src != dst) + objects[dst] = objects[src]; + dst++; + } + } + array->nr = dst; +} + void object_array_remove_duplicates(struct object_array *array) { unsigned int ref, src, dst; diff --git a/object.h b/object.h index 97d384b80a..0d39ff4f9d 100644 --- a/object.h +++ b/object.h @@ -85,6 +85,17 @@ int object_list_contains(struct object_list *list, struct object *obj); /* Object array handling .. */ void add_object_array(struct object *obj, const char *name, struct object_array *array); void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode); + +typedef int (*object_array_each_func_t)(struct object_array_entry *, void *); + +/* + * Apply want to each entry in array, retaining only the entries for + * which the function returns true. Preserve the order of the entries + * that are retained. + */ +void object_array_filter(struct object_array *array, + object_array_each_func_t want, void *cb_data); + void object_array_remove_duplicates(struct object_array *); void clear_object_flags(unsigned flags); -- GitLab