diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-27 10:10:08 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-27 10:10:08 -0500 |
| commit | f01c6f814a278a3d024d34fed0c219c8cb1e1e33 (patch) | |
| tree | 759833d3d7c46bca4f962c5fd442ab3f37d85b14 /src/util | |
| parent | 77a09c92c66bd06440be0ccb75daf07c620acbee (diff) | |
| download | pacman-f01c6f814a278a3d024d34fed0c219c8cb1e1e33.tar.xz | |
Fix several -Wshadow warnings
Only one of these looked like a real red flag, in find_requiredby(), but
it doesn't hurt to fix several of them up anyway.
Unfortunately, we can't turn this on universally due to things like the
sync(), remove(), etc. builtins which we often use as variable names.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/pactree.c | 4 | ||||
| -rw-r--r-- | src/util/testpkg.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/util/pactree.c b/src/util/pactree.c index 2f79b66d..5beaa5a7 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -120,7 +120,7 @@ static char *strtrim(char *str) return str; } -static int register_syncs(pmhandle_t *handle) { +static int register_syncs(void) { FILE *fp; char *ptr, *section = NULL; char line[LINE_MAX]; @@ -421,7 +421,7 @@ int main(int argc, char *argv[]) } if(searchsyncs) { - if(register_syncs(handle) != 0) { + if(register_syncs() != 0) { fprintf(stderr, "error: failed to register sync DBs\n"); ret = 1; goto finish; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index c6f02e34..d4d058d8 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) if(alpm_pkg_load(handle, argv[1], 1, PM_PGP_VERIFY_OPTIONAL, &pkg) == -1 || pkg == NULL) { - enum _pmerrno_t err = alpm_errno(handle); + err = alpm_errno(handle); switch(err) { case PM_ERR_PKG_OPEN: printf("Cannot open the given file.\n"); |