diff options
| author | Jeff King <peff@peff.net> | 2014-10-15 22:34:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-16 17:10:36 (GMT) |
| commit | 68f492359e29bbdf633201406d0646deee2b298c (patch) | |
| tree | 77fc3612755a3e8ee475f812cba20f4df1cbb057 /object.c | |
| parent | 50a71776ab14c63c72c86e3ce1529052bcb2634a (diff) | |
| download | git-68f492359e29bbdf633201406d0646deee2b298c.zip git-68f492359e29bbdf633201406d0646deee2b298c.tar.gz git-68f492359e29bbdf633201406d0646deee2b298c.tar.bz2 | |
object_array: factor out slopbuf-freeing logic
This is not a lot of code, but it's a logical construct that
should not need to be repeated (and we are about to add a
third repetition).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -355,6 +355,16 @@ void add_object_array_with_context(struct object *obj, const char *name, struct add_object_array_with_mode_context(obj, name, array, S_IFINVALID, context); } +/* + * Free all memory associated with an entry; the result is + * in an unspecified state and should not be examined. + */ +static void object_array_release_entry(struct object_array_entry *ent) +{ + if (ent->name != object_array_slopbuf) + free(ent->name); +} + void object_array_filter(struct object_array *array, object_array_each_func_t want, void *cb_data) { @@ -367,8 +377,7 @@ void object_array_filter(struct object_array *array, objects[dst] = objects[src]; dst++; } else { - if (objects[src].name != object_array_slopbuf) - free(objects[src].name); + object_array_release_entry(&objects[src]); } } array->nr = dst; @@ -400,8 +409,7 @@ void object_array_remove_duplicates(struct object_array *array) objects[array->nr] = objects[src]; array->nr++; } else { - if (objects[src].name != object_array_slopbuf) - free(objects[src].name); + object_array_release_entry(&objects[src]); } } } |