diff options
author | Dan McGee <dan@archlinux.org> | 2011-06-30 10:37:08 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-06-30 10:37:08 -0500 |
commit | ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 (patch) | |
tree | d79aa34734791bb069eab172b8ea3e0ee12bedc6 /lib/libalpm/alpm.c | |
parent | 0f4aaeee42135d06dd18eb585eab3bae0e5fbf34 (diff) | |
parent | fed3e09c94d204b4655656c703a178e6fa2144b3 (diff) | |
download | pacman-ad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1.tar.xz |
Merge remote-tracking branch 'allan/breakshit'
Diffstat (limited to 'lib/libalpm/alpm.c')
-rw-r--r-- | lib/libalpm/alpm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index d35512bd..7780c1fd 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -46,13 +46,13 @@ * @param err an optional variable to hold any error return codes * @return a context handle on success, NULL on error, err will be set if provided */ -pmhandle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, - enum _pmerrno_t *err) +alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, + enum _alpm_errno_t *err) { - enum _pmerrno_t myerr; + enum _alpm_errno_t myerr; const char *lf = "db.lck"; size_t lockfilelen; - pmhandle_t *myhandle = _alpm_handle_new(); + alpm_handle_t *myhandle = _alpm_handle_new(); if(myhandle == NULL) { myerr = PM_ERR_MEMORY; @@ -99,10 +99,10 @@ cleanup: * @param handle the context handle * @return 0 on success, -1 on error */ -int SYMEXPORT alpm_release(pmhandle_t *myhandle) +int SYMEXPORT alpm_release(alpm_handle_t *myhandle) { int ret = 0; - pmdb_t *db; + alpm_db_t *db; CHECK_HANDLE(myhandle, return -1); |