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

bin/xbps-install/main.c: rename a var to make gcc-4.6 happy.

Browse Source
This commit is contained in:
Juan RP 2014-10-04 22:05:33 +02:00
parent bc9ddcfcc8
commit 8f25116d54
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-install/main.c
View File

@ -112,12 +112,12 @@ main(int argc, char **argv)
struct xferstat xfer; struct xferstat xfer;
const char *rootdir, *cachedir, *conffile; const char *rootdir, *cachedir, *conffile;
int i, c, flags, rv, fflag = 0; int i, c, flags, rv, fflag = 0;
bool sync, yes, reinstall, drun, update; bool syncf, yes, reinstall, drun, update;
int maxcols; int maxcols;
rootdir = cachedir = conffile = NULL; rootdir = cachedir = conffile = NULL;
flags = rv = 0; flags = rv = 0;
sync = yes = reinstall = drun = update = false; syncf = yes = reinstall = drun = update = false;
memset(&xh, 0, sizeof(xh)); memset(&xh, 0, sizeof(xh));
@ -157,7 +157,7 @@ main(int argc, char **argv)
rootdir = optarg; rootdir = optarg;
break; break;
case 'S': case 'S':
sync = true; syncf = true;
break; break;
case 'u': case 'u':
update = true; update = true;
@ -177,7 +177,7 @@ main(int argc, char **argv)
/* NOTREACHED */ /* NOTREACHED */
} }
} }
if ((!update && !sync) && (argc == optind)) if ((!update && !syncf) && (argc == optind))
usage(true); usage(true);
/* /*
@ -205,7 +205,7 @@ main(int argc, char **argv)
maxcols = get_maxcols(); maxcols = get_maxcols();
/* Sync remote repository data and import keys from remote repos */ /* Sync remote repository data and import keys from remote repos */
if (sync && !drun) { if (syncf && !drun) {
if ((rv = xbps_rpool_sync(&xh, NULL)) != 0) if ((rv = xbps_rpool_sync(&xh, NULL)) != 0)
exit(rv); exit(rv);
rv = xbps_rpool_foreach(&xh, repo_import_key_cb, NULL); rv = xbps_rpool_foreach(&xh, repo_import_key_cb, NULL);
@ -213,7 +213,7 @@ main(int argc, char **argv)
exit(rv); exit(rv);
} }
if (sync && !update && (argc == optind)) if (syncf && !update && (argc == optind))
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
if (!drun && (rv = xbps_pkgdb_lock(&xh)) != 0) { if (!drun && (rv = xbps_pkgdb_lock(&xh)) != 0) {