emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-bin: fix a warning found by -Wshadow on Ubuntu.

Browse Source
This commit is contained in:
Juan RP 2012-07-19 18:00:19 +02:00
parent 634b5f726a
commit 9a69c5e349
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/xbps-bin/main.c
View File

@ -113,12 +113,12 @@ main(int argc, char **argv)
struct sigaction sa; struct sigaction sa;
const char *rootdir, *cachedir, *conffile, *option; const char *rootdir, *cachedir, *conffile, *option;
int i, c, flags, rv; int i, c, flags, rv;
bool sync, yes, reqby_force, force_rm_with_deps, recursive_rm; bool rsync, yes, reqby_force, force_rm_with_deps, recursive_rm;
bool reinstall, show_download_pkglist_url, dry_run; bool reinstall, show_download_pkglist_url, dry_run;
rootdir = cachedir = conffile = option = NULL; rootdir = cachedir = conffile = option = NULL;
flags = rv = 0; flags = rv = 0;
reqby_force = sync = yes = dry_run = force_rm_with_deps = false; reqby_force = rsync = yes = dry_run = force_rm_with_deps = false;
recursive_rm = reinstall = show_download_pkglist_url = false; recursive_rm = reinstall = show_download_pkglist_url = false;
while ((c = getopt(argc, argv, "AC:c:dDFfhMno:Rr:SVvy")) != -1) { while ((c = getopt(argc, argv, "AC:c:dDFfhMno:Rr:SVvy")) != -1) {
@ -166,7 +166,7 @@ main(int argc, char **argv)
rootdir = optarg; rootdir = optarg;
break; break;
case 'S': case 'S':
sync = true; rsync = true;
break; break;
case 'v': case 'v':
flags |= XBPS_FLAG_VERBOSE; flags |= XBPS_FLAG_VERBOSE;
@ -269,7 +269,7 @@ main(int argc, char **argv)
if (argc < 2) if (argc < 2)
usage(true); usage(true);
if (sync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0)) if (rsync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0))
goto out; goto out;
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
@ -283,7 +283,7 @@ main(int argc, char **argv)
if (argc < 2) if (argc < 2)
usage(true); usage(true);
if (sync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0)) if (rsync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0))
goto out; goto out;
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
@ -352,7 +352,7 @@ main(int argc, char **argv)
if (argc != 1) if (argc != 1)
usage(true); usage(true);
if (sync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0)) if (rsync && ((rv = xbps_rpool_sync(&xh, NULL)) != 0))
goto out; goto out;
rv = dist_upgrade(&xh, yes, dry_run, show_download_pkglist_url); rv = dist_upgrade(&xh, yes, dry_run, show_download_pkglist_url);