dirvec: fixed GCC shadow warning
On some systems, string.h declares basename(). This emits a shadow warning. Change the variable name.
This commit is contained in:
@@ -30,21 +30,21 @@ void dirvec_sort(struct dirvec *dv)
|
|||||||
|
|
||||||
struct directory *dirvec_find(const struct dirvec *dv, const char *path)
|
struct directory *dirvec_find(const struct dirvec *dv, const char *path)
|
||||||
{
|
{
|
||||||
char *basename;
|
char *base;
|
||||||
int i;
|
int i;
|
||||||
struct directory *ret = NULL;
|
struct directory *ret = NULL;
|
||||||
|
|
||||||
basename = g_path_get_basename(path);
|
base = g_path_get_basename(path);
|
||||||
|
|
||||||
pthread_mutex_lock(&nr_lock);
|
pthread_mutex_lock(&nr_lock);
|
||||||
for (i = dv->nr; --i >= 0; )
|
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];
|
ret = dv->base[i];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&nr_lock);
|
pthread_mutex_unlock(&nr_lock);
|
||||||
|
|
||||||
g_free(basename);
|
g_free(base);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user