Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7b72dd3096da57d06a77a311ac4e138765d6a2c2
commit 7b72dd3096da57d06a77a311ac4e138765d6a2c2 Author: Michel Hermier <[email protected]> Date: Wed May 7 12:22:11 2014 +0200 s/_pacman_handle_lock/Handle::unlock/ diff --git a/lib/libpacman/handle.cpp b/lib/libpacman/handle.cpp index 96fa1e9..fe4de13 100644 --- a/lib/libpacman/handle.cpp +++ b/lib/libpacman/handle.cpp @@ -121,7 +121,7 @@ int Handle::lock() return (handle->filelock = f_filelock_aquire(lckpath, F_FILELOCK_CREATE_HOLD_DIR | F_FILELOCK_EXCLUSIVE | F_FILELOCK_UNLINK_ON_CLOSE)) != NULL ? 0: -1; } -int _pacman_handle_unlock(Handle *handle) +int Handle::unlock() { int ret = 0; diff --git a/lib/libpacman/handle.h b/lib/libpacman/handle.h index ccb4633..f9a44bf 100644 --- a/lib/libpacman/handle.h +++ b/lib/libpacman/handle.h @@ -53,6 +53,7 @@ public: virtual ~Handle(); int lock(); + int unlock(); pmaccess_t access; uid_t uid; @@ -93,8 +94,6 @@ public: extern libpacman::Handle *handle; -int _pacman_handle_unlock(libpacman::Handle *handle); - #endif /* _PACMAN_HANDLE_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 918c219..16b0dd7 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -123,7 +123,7 @@ int pacman_release(void) pacman_db_unregister(handle->dbs_sync->data); } - if(_pacman_handle_unlock(handle) != 0) { + if(handle->unlock() != 0) { return -1; } delete handle; @@ -538,7 +538,7 @@ int pacman_db_update(int force, pmdb_t *_db) } status = _pacman_syncdb_update(db, force); - if(_pacman_handle_unlock(handle) != 0) { + if(handle->unlock() != 0) { return -1; } return status; @@ -1217,7 +1217,7 @@ int pacman_trans_release() handle->db_local->settimestamp(NULL); - if(_pacman_handle_unlock(handle) != 0) { + if(handle->unlock() != 0) { return -1; } return(0); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
