bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor display_targets to not be recursive

Browse source 
This also fixes a memory leak and makes the dual-purpose "rows" variable
go away in favor of storing the rows and non-verbose names separately.

This also fixes some potential memory leaks and/or wrong behavior due to
the config->verbosepkglists flag being flipped, which we should never be
doing.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-28 12:55:27 -05:00
parent e0acf2f144
commit d1af9b70c8
1 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/pacman/util.c
View file

@ -817,13 +817,13 @@ static alpm_list_t *create_verbose_row(pm_target_t *target, int dl_size)
} }
/* prepare a list of pkgs to display */ /* prepare a list of pkgs to display */
static void _display_targets(alpm_list_t *targets) static void _display_targets(alpm_list_t *targets, int verbose)
{ {
char *str; char *str;
const char *label; const char *label;
double size; double size;
off_t isize = 0, rsize = 0, dlsize = 0; off_t isize = 0, rsize = 0, dlsize = 0;
alpm_list_t *i, *header = NULL, *rows = NULL; alpm_list_t *i, *rows = NULL, *names = NULL;
int show_dl_size = config->op == PM_OP_SYNC; int show_dl_size = config->op == PM_OP_SYNC;
if(!targets) { if(!targets) {
@ -843,9 +843,8 @@ static void _display_targets(alpm_list_t *targets)
rsize += alpm_pkg_get_isize(target->remove); rsize += alpm_pkg_get_isize(target->remove);
} }
if(config->verbosepkglists) { /* form data for both verbose and non-verbose display */
rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size)); rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size));
} else {
if(target->install) { if(target->install) {
pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install),
alpm_pkg_get_version(target->install)); alpm_pkg_get_version(target->install));
@ -853,26 +852,34 @@ static void _display_targets(alpm_list_t *targets)
pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove),
alpm_pkg_get_version(target->remove)); alpm_pkg_get_version(target->remove));
} }
rows = alpm_list_add(rows, str); names = alpm_list_add(names, str);
}
} }
/* print to screen */ /* print to screen */
pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets));
printf("\n"); printf("\n");
if(config->verbosepkglists) { if(verbose) {
header = create_verbose_header(show_dl_size); alpm_list_t *header = create_verbose_header(show_dl_size);
if(table_display(str, header, rows) != 0) { if(table_display(str, header, rows) != 0) {
config->verbosepkglists = 0; /* fallback to list display if table wouldn't fit */
_display_targets(targets); list_display(str, names);
goto out;
} }
alpm_list_free(header);
} else { } else {
list_display(str, rows); list_display(str, names);
} }
printf("\n"); printf("\n");
/* rows is a list of lists of strings, free inner lists here */
for(i = rows; i; i = alpm_list_next(i)) {
alpm_list_t *lp = alpm_list_getdata(i);
FREELIST(lp);
}
alpm_list_free(rows);
FREELIST(names);
free(str);
if(dlsize > 0 || config->op_s_downloadonly) { if(dlsize > 0 || config->op_s_downloadonly) {
size = humanize_size(dlsize, 'M', &label); size = humanize_size(dlsize, 'M', &label);
printf(_("Total Download Size: %.2f %s\n"), size, label); printf(_("Total Download Size: %.2f %s\n"), size, label);
@ -892,20 +899,6 @@ static void _display_targets(alpm_list_t *targets)
printf(_("Net Upgrade Size: %.2f %s\n"), size, label); printf(_("Net Upgrade Size: %.2f %s\n"), size, label);
} }
} }
out:
/* cleanup */
if(config->verbosepkglists) {
/* rows is a list of lists of strings, free inner lists here */
for(i = rows; i; i = alpm_list_next(i)) {
alpm_list_t *lp = alpm_list_getdata(i);
FREELIST(lp);
}
alpm_list_free(header);
} else {
FREELIST(rows);
}
free(str);
} }
static int target_cmp(const void *p1, const void *p2) static int target_cmp(const void *p1, const void *p2)
@ -959,7 +952,7 @@ void display_targets(void)
} }
targets = alpm_list_msort(targets, alpm_list_count(targets), target_cmp); targets = alpm_list_msort(targets, alpm_list_count(targets), target_cmp);
_display_targets(targets); _display_targets(targets, config->verbosepkglists);
FREELIST(targets); FREELIST(targets);
} }