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/pacman/callback.c | |
parent | 77a09c92c66bd06440be0ccb75daf07c620acbee (diff) |
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/pacman/callback.c')
-rw-r--r-- | src/pacman/callback.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 66b14cdd..ffca8bec 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -623,14 +623,14 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) /* if padwid is < 0, we need to trim the string so padwid = 0 */ if(padwid < 0) { int i = filenamelen - 3; - wchar_t *p = wcfname; + wchar_t *wcp = wcfname; /* grab the max number of char columns we can fill */ - while(i > 0 && wcwidth(*p) < i) { - i -= wcwidth(*p); - p++; + while(i > 0 && wcwidth(*wcp) < i) { + i -= wcwidth(*wcp); + wcp++; } /* then add the ellipsis and fill out any extra padding */ - wcscpy(p, L"..."); + wcscpy(wcp, L"..."); padwid = i; } |