From da933c223eedb66c51b4a48b6ab0ce8fcb344b5c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 2 Sep 2008 12:27:32 -0500 Subject: Remove unnecessary initialization in new functions We don't need to zero things out, we are already using calloc for this purpose. Signed-off-by: Dan McGee --- lib/libalpm/handle.c | 9 --------- lib/libalpm/trans.c | 9 --------- src/pacman/conf.c | 4 ---- 3 files changed, 22 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index af1cc78b..7dc01223 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -48,16 +48,7 @@ pmhandle_t *_alpm_handle_new() ALPM_LOG_FUNC; CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL)); - handle->lckfd = -1; - handle->logstream = NULL; - - handle->root = NULL; - handle->dbpath = NULL; - handle->cachedirs = NULL; - handle->lockfile = NULL; - handle->logfile = NULL; - handle->usedelta = 0; return(handle); } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index d6b165d3..d2336454 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -227,15 +227,6 @@ pmtrans_t *_alpm_trans_new() ALPM_LOG_FUNC; CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL)); - - trans->packages = NULL; - trans->skip_add = NULL; - trans->skip_remove = NULL; - trans->type = 0; - trans->flags = 0; - trans->cb_event = NULL; - trans->cb_conv = NULL; - trans->cb_progress = NULL; trans->state = STATE_IDLE; return(trans); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 48c927bf..5853facc 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -44,10 +44,6 @@ config_t *config_new(void) newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING; /* CONFFILE is defined at compile-time */ newconfig->configfile = strdup(CONFFILE); - newconfig->rootdir = NULL; - newconfig->dbpath = NULL; - newconfig->logfile = NULL; - newconfig->syncfirst = NULL; return(newconfig); } -- cgit v1.2.3-70-g09d2