diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-01-23 02:34:58 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-01-23 02:34:58 +0100 |
| commit | 4db24ca28a31d1d0d97b30b186fd5255a0ae0113 (patch) | |
| tree | 0ffe8319426d9ad84a6563883c445fc0fa0d6f40 /lib/libalpm/db.c | |
| parent | 2a8b835dda8cf38636cad618bc01b433ef9eefa5 (diff) | |
| download | pacman-4db24ca28a31d1d0d97b30b186fd5255a0ae0113.tar.gz pacman-4db24ca28a31d1d0d97b30b186fd5255a0ae0113.tar.xz | |
* Added some calloc calls to replace the malloc-then-set-to-zero functionality
* Fixed -Ss output so as not to call alpm_list_getdata with a NULl list
* Added a NULL check in alpm_list_getdata
* Fixed alpm_list_add_sorted to properly handle a new / beginning insertions
Diffstat (limited to 'lib/libalpm/db.c')
| -rw-r--r-- | lib/libalpm/db.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 84c05ccc..363ce2a5 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -55,14 +55,14 @@ pmdb_t *_alpm_db_new(char *root, char* dbpath, char *treename) { pmdb_t *db; - db = (pmdb_t *)malloc(sizeof(pmdb_t)); + db = calloc(1, sizeof(pmdb_t)); if(db == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failed: could not allocate %d bytes"), sizeof(pmdb_t)); RET_ERR(PM_ERR_MEMORY, NULL); } - db->path = (char *)malloc(strlen(root)+strlen(dbpath)+strlen(treename)+2); + db->path = calloc(1, strlen(root)+strlen(dbpath)+strlen(treename)+2); if(db->path == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failed: could not allocate %d bytes"), strlen(root)+strlen(dbpath)+strlen(treename)+2); @@ -73,10 +73,6 @@ pmdb_t *_alpm_db_new(char *root, char* dbpath, char *treename) STRNCPY(db->treename, treename, PATH_MAX); - db->pkgcache = NULL; - db->grpcache = NULL; - db->servers = NULL; - return(db); } |