diff options
| author | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
| commit | c22e381a8b86412b6c181446128affe32ab1d71e (patch) | |
| tree | 198d527a3d49819f57fabd8355673328969cc893 /lib/libalpm/sync.c | |
| parent | 13525255dcd257e69d7c246bf32ceb263fbc31b9 (diff) | |
| download | pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.gz pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.xz | |
Post trial install changes, round one
A bunch of changes related to my first "real" install of pacman-git into
/usr/local and trying to use it.
* Shift some uses of free -> FREE in libalpm.
* Move stat and sanity checks of config paths into libalpm from the
config and argument parsing in pacman.c.
* Fix issue where dbpath still was not defined early enough due to its
requirement for being used in alpm_db_register. This should be rewritten
so it doesn't have this dependency, but this will work for now.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 336e3ff9..8aabcdb3 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -734,7 +734,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* file is not in the cache dir, so add it to the list */ files = alpm_list_add(files, strdup(fname)); } - free(fpath); + FREE(fpath); } } } @@ -805,7 +805,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) *data = alpm_list_add(*data, ptr); retval = 1; } - free(filepath); + FREE(filepath); FREE(md5sum2); } if(retval) { @@ -885,10 +885,10 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fpath = _alpm_filecache_find(fname); if(_alpm_trans_addtarget(tr, fpath) == -1) { - free(fpath); + FREE(fpath); goto error; } - free(fpath); + FREE(fpath); /* using alpm_list_last() is ok because addtarget() adds the new target at the * end of the tr->packages list */ |