From ed6e8038f98e7f15e571a9a291ee4acf438b4dc5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Jun 2016 14:09:22 -0700 Subject: pathspec: rename free_pathspec() to clear_pathspec() The function takes a pointer to a pathspec structure, and releases the resources held by it, but does not free() the structure itself. Such a function should be called "clear", not "free". Signed-off-by: Junio C Hamano --- notes-merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'notes-merge.c') diff --git a/notes-merge.c b/notes-merge.c index 34bfac0c68..b7814c9b64 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -170,7 +170,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o, sha1_to_hex(mp->remote)); } diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); *num_changes = len; return changes; @@ -256,7 +256,7 @@ static void diff_tree_local(struct notes_merge_options *o, sha1_to_hex(mp->local)); } diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); } static void check_notes_merge_worktree(struct notes_merge_options *o) -- cgit v1.2.1