undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object_array: add function object_array_filter()

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2013-05-25 11:08:08 +02:00 committed by Junio C Hamano
parent ff5f5f268f
commit aeb4a51ef8
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
object.c
View File

@ -278,6 +278,22 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj
array->nr = ++nr; 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) void object_array_remove_duplicates(struct object_array *array)
{ {
unsigned int ref, src, dst; unsigned int ref, src, dst;

11
object.h
View File

@ -85,6 +85,17 @@ int object_list_contains(struct object_list *list, struct object *obj);
/* Object array handling .. */ /* Object array handling .. */
void add_object_array(struct object *obj, const char *name, struct object_array *array); 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); 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 object_array_remove_duplicates(struct object_array *);
void clear_object_flags(unsigned flags); void clear_object_flags(unsigned flags);