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

create_verbose_row: free malloc'd strings

Browse source 
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2014-01-06 11:58:25 -05:00 • committed by Allan McRae
parent 480a9ff82f
commit 3f34e0936a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pacman/util.c
View file

@ -808,23 +808,23 @@ static alpm_list_t *create_verbose_row(pm_target_t *target)
} else { } else {
pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove));
} }
add_table_cell(&ret, str, CELL_NORMAL); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE);
/* old and new versions */ /* old and new versions */
pm_asprintf(&str, "%s", pm_asprintf(&str, "%s",
target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); target->remove != NULL ? alpm_pkg_get_version(target->remove) : "");
add_table_cell(&ret, str, CELL_NORMAL); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE);
pm_asprintf(&str, "%s", pm_asprintf(&str, "%s",
target->install != NULL ? alpm_pkg_get_version(target->install) : ""); target->install != NULL ? alpm_pkg_get_version(target->install) : "");
add_table_cell(&ret, str, CELL_NORMAL); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE);
/* and size */ /* and size */
size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0;
size += target->install ? alpm_pkg_get_isize(target->install) : 0; size += target->install ? alpm_pkg_get_isize(target->install) : 0;
human_size = humanize_size(size, 'M', 2, &label); human_size = humanize_size(size, 'M', 2, &label);
pm_asprintf(&str, "%.2f %s", human_size, label); pm_asprintf(&str, "%.2f %s", human_size, label);
add_table_cell(&ret, str, CELL_RIGHT_ALIGN); add_table_cell(&ret, str, CELL_RIGHT_ALIGN | CELL_FREE);
size = target->install ? alpm_pkg_download_size(target->install) : 0; size = target->install ? alpm_pkg_download_size(target->install) : 0;
if(size != 0) { if(size != 0) {
@ -833,7 +833,7 @@ static alpm_list_t *create_verbose_row(pm_target_t *target)
} else { } else {
str = NULL; str = NULL;
} }
add_table_cell(&ret, str, CELL_RIGHT_ALIGN); add_table_cell(&ret, str, CELL_RIGHT_ALIGN | CELL_FREE);
return ret; return ret;
} }