diff options
author | Dan McGee <dan@archlinux.org> | 2012-02-13 10:12:39 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-02-13 10:14:06 -0600 |
commit | c7321a7b80aebeacb05ad5ab9d096779403b1758 (patch) | |
tree | 8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /src/pacman/pacman.c | |
parent | 115c0381c235100d7b05d9751767017a9ee325c4 (diff) | |
parent | b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff) |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
src/util/pactree.c
Diffstat (limited to 'src/pacman/pacman.c')
-rw-r--r-- | src/pacman/pacman.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 014520e8..0349726b 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -721,7 +721,9 @@ static int parseargs(int argc, char *argv[]) return 0; } -/** print commandline to logfile +/** Print command line to logfile. + * @param argc + * @param argv */ static void cl_to_log(int argc, char* argv[]) { @@ -749,8 +751,8 @@ static void cl_to_log(int argc, char* argv[]) } /** Main function. - * @param argc argc - * @param argv argv + * @param argc + * @param argv * @return A return code indicating success, failure, etc. */ int main(int argc, char *argv[]) @@ -904,7 +906,7 @@ int main(int argc, char *argv[]) list_display("Targets :", pm_targets); } - /* Log commandline */ + /* Log command line */ if(needs_root()) { cl_to_log(argc, argv); } |