Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4b8b939e59d4d947b397c0f528192582be48e348
commit 4b8b939e59d4d947b397c0f528192582be48e348 Author: Miklos Vajna <[email protected]> Date: Wed Feb 3 21:04:44 2016 +0100 -Werror=shadow diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index 51ee6be..401d8fd 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -293,14 +293,14 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) struct archive_entry *entry; char expath[PATH_MAX]; pmlist_t *cache = NULL, *i; - DIR *handle; + DIR *dirhandle; struct dirent *ent; struct stat buf; /* first scan though the old dir to see what package entries do we have */ - handle = opendir(prefix); - if (handle != NULL) { - while((ent = readdir(handle)) != NULL) { + dirhandle = opendir(prefix); + if (dirhandle != NULL) { + while((ent = readdir(dirhandle)) != NULL) { cache_t *c; if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { continue; @@ -318,7 +318,7 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) cache = _pacman_list_add(cache, c); } } - closedir(handle); + closedir(dirhandle); /* now extract the new entries */ if ((_archive = archive_read_new ()) == NULL) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
