dir.c: add free_excludes()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Nov 27, 2010 at 01:17 UTC
0fd0e2417d383168b6a510f78c754298435a89ce
3 files changed
+14
-5
dir.c
+12
@@ -223,6 +223,18 @@ static void *read_skip_worktree_file_from_index(const char *path, size_t *size)
223
return data;
224
}
225
226
+void free_excludes(struct exclude_list *el)
227
+{
228
+ int i;
229
+
230
+ for (i = 0; i < el->nr; i++)
231
+ free(el->excludes[i]);
232
+ free(el->excludes);
233
+
234
+ el->nr = 0;
235
+ el->excludes = NULL;
236
+}
237
+
238
int add_excludes_from_file_to_list(const char *fname,
239
const char *base,
240
int baselen,
dir.h
+1
@@ -78,6 +78,7 @@ extern int add_excludes_from_file_to_list(const char *fname, const char *base, i
78
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
79
extern void add_exclude(const char *string, const char *base,
80
int baselen, struct exclude_list *which);
81
+extern void free_excludes(struct exclude_list *el);
82
extern int file_exists(const char *);
83
84
extern char *get_relative_cwd(char *buffer, int size, const char *dir);
unpack-trees.c
+1
-5
@@ -945,11 +945,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
945
*o->dst_index = o->result;
946
947
done:
948
- for (i = 0;i < el.nr;i++)
949
- free(el.excludes[i]);
950
- if (el.excludes)
951
- free(el.excludes);
952
-
948
+ free_excludes(&el);
949
return ret;
950
951
return_failed: