From 1358a4a80f4d8edbeedc0fdd1e026b491cbb8815 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 11 Feb 2011 10:36:41 -0600 Subject: diskspace: use calloc instead of malloc Prevents us from having to manually zero out several of our fields. Signed-off-by: Dan McGee --- lib/libalpm/diskspace.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 420a2496..96f73008 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -81,15 +81,11 @@ static alpm_list_t *mount_point_list(void) continue; } - MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); + CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), &fsp, sizeof(FSSTATSTYPE)); - mp->blocks_needed = 0l; - mp->max_blocks_needed = 0l; - mp->used = 0; - mount_points = alpm_list_add(mount_points, mp); } @@ -105,15 +101,11 @@ static alpm_list_t *mount_point_list(void) } for(; entries-- > 0; fsp++) { - MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); + CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(fsp->f_mntonname); mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); - mp->blocks_needed = 0l; - mp->max_blocks_needed = 0l; - mp->used = 0; - mount_points = alpm_list_add(mount_points, mp); } #endif -- cgit v1.2.3-70-g09d2