diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-05-08 17:23:58 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-05-20 17:54:42 -0500 |
| commit | e533478e02882170653d79b756ae3d5690d076e9 (patch) | |
| tree | beb9840e8359b505426ea34a2095679f28a7f024 /lib/libalpm/dload.c | |
| parent | 363894e27b07f00d7b1cd9f92214f3f457ac4c48 (diff) | |
| download | pacman-e533478e02882170653d79b756ae3d5690d076e9.tar.xz | |
fix -Wshadow warnings as reported by gcc 4.4.3
Apparently gcc 4.7 has decided that -Wshadow warnings aren't worth
reporting anymore even with the flag enabled. These were found on
an Ubuntu 10.04 install.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/dload.c')
| -rw-r--r-- | lib/libalpm/dload.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 49bfa26f..6aaff1d2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -322,7 +322,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, } } -static void mask_signal(int signal, void (*handler)(int), +static void mask_signal(int signum, void (*handler)(int), struct sigaction *origaction) { struct sigaction newaction; @@ -331,13 +331,13 @@ static void mask_signal(int signal, void (*handler)(int), sigemptyset(&newaction.sa_mask); newaction.sa_flags = 0; - sigaction(signal, NULL, origaction); - sigaction(signal, &newaction, NULL); + sigaction(signum, NULL, origaction); + sigaction(signum, &newaction, NULL); } -static void unmask_signal(int signal, struct sigaction *sa) +static void unmask_signal(int signum, struct sigaction *sa) { - sigaction(signal, sa, NULL); + sigaction(signum, sa, NULL); } static FILE *create_tempfile(struct dload_payload *payload, const char *localpath) @@ -623,18 +623,18 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, static char *filecache_find_url(alpm_handle_t *handle, const char *url) { - const char *basename = strrchr(url, '/'); + const char *filebase = strrchr(url, '/'); - if(basename == NULL) { + if(filebase == NULL) { return NULL; } - basename++; - if(basename == '\0') { + filebase++; + if(filebase == '\0') { return NULL; } - return _alpm_filecache_find(handle, basename); + return _alpm_filecache_find(handle, filebase); } /** Fetch a remote pkg. */ |