Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=476102b5b4b333bc650ead85a8e847e86005e727
commit 476102b5b4b333bc650ead85a8e847e86005e727 Author: Michel Hermier <[email protected]> Date: Wed May 7 12:15:12 2014 +0200 libpacman: s/_pacman_handle_lock/Handle::lock/ diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index 312eb4c..96fa1e9 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -113,13 +113,11 @@ Handle::~Handle() FREELIST(needles); } -int _pacman_handle_lock(Handle *handle) +int Handle::lock() { char lckpath[PATH_MAX]; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); - - snprintf(lckpath, PATH_MAX, "%s/%s", handle->root, PM_LOCK); + snprintf(lckpath, PATH_MAX, "%s/%s", root, PM_LOCK); return (handle->filelock = f_filelock_aquire(lckpath, F_FILELOCK_CREATE_HOLD_DIR | F_FILELOCK_EXCLUSIVE | F_FILELOCK_UNLINK_ON_CLOSE)) != NULL ? 0: -1; } diff --git a/lib/libpacman/handle.h b/lib/libpacman/handle.h index 357066d..ccb4633 100644 --- a/lib/libpacman/handle.h +++ b/lib/libpacman/handle.h @@ -52,6 +52,8 @@ public: Handle(); virtual ~Handle(); + int lock(); + pmaccess_t access; uid_t uid; libpacman::Database *db_local; @@ -91,7 +93,6 @@ public: extern libpacman::Handle *handle; -int _pacman_handle_lock(libpacman::Handle *handle); int _pacman_handle_unlock(libpacman::Handle *handle); #endif /* _PACMAN_HANDLE_H */ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 23f23f1..918c219 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -530,7 +530,7 @@ int pacman_db_update(int force, pmdb_t *_db) /* Do not update a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); - if(_pacman_handle_lock(handle) != 0) { + if(handle->lock() != 0) { return -1; } if(!f_ptrlist_contains_ptr(handle->dbs_sync, db)) { @@ -1111,7 +1111,7 @@ int pacman_trans_init(unsigned char type, unsigned int flags, pacman_trans_cb_ev ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); - if(_pacman_handle_lock(handle) != 0) { + if(handle->lock() != 0) { return -1; } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
