diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2008-07-31 13:38:30 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-08-23 08:38:11 -0500 |
| commit | 9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90 (patch) | |
| tree | fa47f6756811bd9f85b259199964a6b1e5169cd0 /src/pacman/package.c | |
| parent | 901e4aa5c203f605e9d527e474821426a40e5cea (diff) | |
| download | pacman-9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90.tar.xz | |
Move the the description parsing logic to string_display()
So dump_pkg_full will indent all strings correctly.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
[Xav: add string_length function]
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/package.c')
| -rw-r--r-- | src/pacman/package.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c index 06800378..87ffd985 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -44,13 +44,11 @@ */ void dump_pkg_full(pmpkg_t *pkg, int level) { - const char *reason, *descheader; + const char *reason; time_t bdate, idate; char bdatestr[50] = "", idatestr[50] = ""; const alpm_list_t *i; alpm_list_t *requiredby = NULL, *depstrings = NULL; - wchar_t *wcstr; - int len; if(pkg == NULL) { return; @@ -132,19 +130,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) if(level < 0) { string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg)); } - - /* printed using a variable to make i18n safe */ - descheader = _("Description : "); - /* len goes from # bytes -> # chars -> # cols */ - len = strlen(descheader) + 1; - wcstr = calloc(len, sizeof(wchar_t)); - len = mbstowcs(wcstr, descheader, len); - len = wcswidth(wcstr, len); - free(wcstr); - /* we can finally print the darn thing */ - printf("%s", descheader); - indentprint(alpm_pkg_get_desc(pkg), len); - printf("\n\n"); + string_display(_("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ if(level > 1) { |