From 3dac99034afe14e61554f327329c11d32962ae04 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Oct 2008 21:28:16 +0100 Subject: dirvec: fixed GCC shadow warning On some systems, string.h declares basename(). This emits a shadow warning. Change the variable name. --- src/dirvec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dirvec.c b/src/dirvec.c index b178f311a..a9e59ab68 100644 --- a/src/dirvec.c +++ b/src/dirvec.c @@ -30,21 +30,21 @@ void dirvec_sort(struct dirvec *dv) struct directory *dirvec_find(const struct dirvec *dv, const char *path) { - char *basename; + char *base; int i; struct directory *ret = NULL; - basename = g_path_get_basename(path); + base = g_path_get_basename(path); pthread_mutex_lock(&nr_lock); for (i = dv->nr; --i >= 0; ) - if (!strcmp(directory_get_name(dv->base[i]), basename)) { + if (!strcmp(directory_get_name(dv->base[i]), base)) { ret = dv->base[i]; break; } pthread_mutex_unlock(&nr_lock); - g_free(basename); + g_free(base); return ret; } -- cgit v1.2.3