mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Renamed the lock functions.
Also cleaned up the dotlock code for easier readability.
This commit is contained in:
parent
acde3f8ea6
commit
b73ae3ca36
16 changed files with 564 additions and 399 deletions
|
@ -306,7 +306,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
|
|||
if (!keyring_is_writable(kr))
|
||||
continue;
|
||||
if (!kr->lockhd) {
|
||||
kr->lockhd = create_dotlock( kr->fname );
|
||||
kr->lockhd = dotlock_create( kr->fname );
|
||||
if (!kr->lockhd) {
|
||||
log_info ("can't allocate lock for `%s'\n", kr->fname );
|
||||
rc = G10ERR_GENERAL;
|
||||
|
@ -322,7 +322,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
|
|||
continue;
|
||||
if (kr->is_locked)
|
||||
;
|
||||
else if (make_dotlock (kr->lockhd, -1) ) {
|
||||
else if (dotlock_take (kr->lockhd, -1) ) {
|
||||
log_info ("can't lock `%s'\n", kr->fname );
|
||||
rc = G10ERR_GENERAL;
|
||||
}
|
||||
|
@ -337,7 +337,7 @@ keyring_lock (KEYRING_HANDLE hd, int yes)
|
|||
continue;
|
||||
if (!kr->is_locked)
|
||||
;
|
||||
else if (release_dotlock (kr->lockhd))
|
||||
else if (dotlock_release (kr->lockhd))
|
||||
log_info ("can't unlock `%s'\n", kr->fname );
|
||||
else
|
||||
kr->is_locked = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue