diff options
| author | Werner Koch <wk@gnupg.org> | 2011-09-23 14:43:58 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-09-23 14:43:58 +0200 |
| commit | b73ae3ca36547939c9aaf54c0d05fbc93d47c096 (patch) | |
| tree | 3e7dfac40a0da7a3a03336713a642ca093d5f6f7 /g10/keyring.c | |
| parent | Remove support for RISCOS from dotlock.c (diff) | |
| download | gnupg2-b73ae3ca36547939c9aaf54c0d05fbc93d47c096.tar.xz gnupg2-b73ae3ca36547939c9aaf54c0d05fbc93d47c096.zip | |
Renamed the lock functions.
Also cleaned up the dotlock code for easier readability.
Diffstat (limited to 'g10/keyring.c')
| -rw-r--r-- | g10/keyring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/keyring.c b/g10/keyring.c index 12356e23c..480c0e9bd 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -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; |