is_refname_available(): avoid shadowing "dir" variable

The function had a "dir" parameter that was shadowed by a local "dir"
variable within a code block. Use the former in place of the latter.
(This is consistent with "dir"'s use elsewhere in the function.)

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Michael Haggerty 2015-05-11 17:25:05 +02:00 коммит произвёл Junio C Hamano
Родитель 49e818762a
Коммит 9ef6eaa287
1 изменённых файлов: 2 добавлений и 2 удалений

4
refs.c
Просмотреть файл

@ -967,10 +967,10 @@ static int is_refname_available(const char *refname,
* "refs/foo/bar/"). It is a problem iff it contains * "refs/foo/bar/"). It is a problem iff it contains
* any ref that is not in "skip". * any ref that is not in "skip".
*/ */
struct ref_entry *entry = dir->entries[pos];
struct ref_dir *dir = get_ref_dir(entry);
struct nonmatching_ref_data data; struct nonmatching_ref_data data;
struct ref_entry *entry = dir->entries[pos];
dir = get_ref_dir(entry);
data.skip = skip; data.skip = skip;
sort_ref_dir(dir); sort_ref_dir(dir);
if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data))