diff options
| author | Dan McGee <dan@archlinux.org> | 2007-06-04 18:51:23 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-06-05 05:10:49 +0200 |
| commit | 358cc5804a2df873180e6d9ef2420ab3247f8437 (patch) | |
| tree | 9254dd518c1873aebe78f548d311202a6f1fe2aa /src/pacman/util.c | |
| parent | 6949ab97613de3622a4c392a3d33080164eec794 (diff) | |
| download | pacman-358cc5804a2df873180e6d9ef2420ab3247f8437.tar.gz pacman-358cc5804a2df873180e6d9ef2420ab3247f8437.tar.xz | |
Rip alpm_parse_config out of libalpm
Switch over to the new frontend parseconfig.
* Fix a few issues in parseconfig
* Remove unused callback upon database registration
* Remove conf file related errors from error.c/alpm.h
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/util.c')
| -rw-r--r-- | src/pacman/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c index 406145e3..e88001ac 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -210,7 +210,7 @@ char *strtrim(char *str) { char *pch = str; - if(*str == '\0') { + if(str == NULL || *str == '\0') { /* string is empty, so we're done. */ return(str); } @@ -350,7 +350,7 @@ void display_targets(alpm_list_t *syncpkgs) isize += alpm_pkg_get_isize(pkg); /* print the package size with the output if ShowSize option set */ - if(alpm_option_get_showsize()) { + if(config->showsize) { /* Convert byte size to MB */ mbdispsize = dispsize / (1024.0 * 1024.0); |