index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Dan McGee <dan@archlinux.org> | 2011-03-21 07:53:13 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-03-21 07:53:13 -0500 |
commit | 0ff52b68452046d61c24649ec94886bd74faab45 (patch) | |
tree | a9960a6143d17aeedeb530f2fe57c6796966e205 /src/pacman/pacman.c | |
parent | c67c864ffd50ec0e071b055897c4622eaa132fc2 (diff) | |
parent | b0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff) |
-rw-r--r-- | src/pacman/pacman.c | 18 |
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6d377d2e..e4555c03 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -740,7 +740,8 @@ static int parseargs(int argc, char *argv[]) } else if(opt == '?') { /* this should have failed during first pass already */ return 1; - } else if(parsearg_op(opt, 1) == 0) { /* opt is an operation */ + } else if(parsearg_op(opt, 1) == 0) { + /* opt is an operation */ continue; } @@ -757,18 +758,17 @@ static int parseargs(int argc, char *argv[]) case PM_OP_SYNC: result = parsearg_sync(opt); break; - case PM_OP_DEPTEST: - result = 1; - break; case PM_OP_UPGRADE: result = parsearg_upgrade(opt); break; + case PM_OP_DEPTEST: default: - pm_printf(PM_LOG_ERROR, _("no operation specified (use -h for help)\n")); - return 1; + result = 1; + break; } - if (result == 0) + if (result == 0) { continue; + } /* fall back to global options */ result = parsearg_global(opt); @@ -1230,9 +1230,7 @@ static int _parseconfig(const char *file, const char *givensection, } cleanup: - if(fp) { - fclose(fp); - } + fclose(fp); if(section){ free(section); } |