Skip to content

Commit

Permalink
object_array: add function object_array_filter()
Browse files Browse the repository at this point in the history
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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed May 28, 2013
1 parent ff5f5f2 commit aeb4a51
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
16 changes: 16 additions & 0 deletions object.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 11 additions & 0 deletions object.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit aeb4a51

Please sign in to comment.