diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/gpg.c | 4 | ||||
| -rw-r--r-- | g10/gpgv.c | 14 | ||||
| -rw-r--r-- | g10/keydb.c | 8 | ||||
| -rw-r--r-- | g10/keyring.c | 6 | ||||
| -rw-r--r-- | g10/tdbio.c | 24 |
6 files changed, 37 insertions, 28 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index be131964d..4b5f2f141 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2011-09-23 Werner Koch <[email protected]> + + * gpgv.c (disable_dotlock): Rename to dotlock_disable. + (create_dotlock): Rename to dotlock_create. + (destroy_dotlock): Rename to dotlock_destroy. + (make_dotlock): Rename to dotlock_take. + (release_dotlock): Rename to dotlock_release. + (lockfiles_remove): Rename to dotlock_remove_lockfiles. + 2011-09-20 Werner Koch <[email protected]> * free-packet.c (free_public_key): Allow a NULL argument. @@ -1969,7 +1969,7 @@ main (int argc, char **argv) gnupg_init_signals (0, emergency_cleanup); - create_dotlock(NULL); /* Register locking cleanup. */ + dotlock_create (NULL); /* Register lock file cleanup. */ opt.session_env = session_env_new (); if (!opt.session_env) @@ -2651,7 +2651,7 @@ main (int argc, char **argv) case oNoEscapeFrom: opt.escape_from = 0; break; case oLockOnce: opt.lock_once = 1; break; case oLockNever: - disable_dotlock (); + dotlock_disable (); break; case oLockMultiple: #ifndef __riscos__ diff --git a/g10/gpgv.c b/g10/gpgv.c index 9f46ab39c..9328343a1 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -163,7 +163,7 @@ main( int argc, char **argv ) tty_no_terminal(1); tty_batchmode(1); - disable_dotlock(); + dotlock_disable (); pargs.argc = &argc; pargs.argv = &argv; @@ -502,25 +502,25 @@ agent_scd_getattr (const char *name, struct agent_card_info_s *info) /* We do not do any locking, so use these stubs here */ void -disable_dotlock (void) +dotlock_disable (void) { } dotlock_t -create_dotlock (const char *file_to_lock) +dotlock_create (const char *file_to_lock) { (void)file_to_lock; return NULL; } void -destroy_dotlock (dotlock_t h) +dotlock_destroy (dotlock_t h) { (void)h; } int -make_dotlock (dotlock_t h, long timeout) +dotlock_take (dotlock_t h, long timeout) { (void)h; (void)timeout; @@ -528,14 +528,14 @@ make_dotlock (dotlock_t h, long timeout) } int -release_dotlock (dotlock_t h) +dotlock_release (dotlock_t h) { (void)h; return 0; } void -remove_lockfiles (void) +dotlock_remove_lockfiles (void) { } diff --git a/g10/keydb.c b/g10/keydb.c index f7642485a..e4b97096f 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -136,7 +136,7 @@ maybe_create_keyring (char *filename, int force) /* To avoid races with other instances of gpg trying to create or update the keyring (it is removed during an update for a short time), we do the next stuff in a locked state. */ - lockhd = create_dotlock (filename); + lockhd = dotlock_create (filename); if (!lockhd) { /* A reason for this to fail is that the directory is not @@ -152,7 +152,7 @@ maybe_create_keyring (char *filename, int force) return gpg_error (GPG_ERR_GENERAL); } - if ( make_dotlock (lockhd, -1) ) + if ( dotlock_take (lockhd, -1) ) { /* This is something bad. Probably a stale lockfile. */ log_info ("can't lock `%s'\n", filename ); @@ -196,8 +196,8 @@ maybe_create_keyring (char *filename, int force) leave: if (lockhd) { - release_dotlock (lockhd); - destroy_dotlock (lockhd); + dotlock_release (lockhd); + dotlock_destroy (lockhd); } return rc; } 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; diff --git a/g10/tdbio.c b/g10/tdbio.c index 09f31aa5d..968d06b3c 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -257,7 +257,7 @@ put_record_into_cache( ulong recno, const char *data ) if( !n ) n = 1; if( !is_locked ) { - if( make_dotlock( lockhandle, -1 ) ) + if( dotlock_take( lockhandle, -1 ) ) log_fatal("can't acquire lock - giving up\n"); else is_locked = 1; @@ -276,7 +276,7 @@ put_record_into_cache( ulong recno, const char *data ) } } if( !opt.lock_once ) { - if( !release_dotlock( lockhandle ) ) + if( !dotlock_release( lockhandle ) ) is_locked = 0; } assert( unused ); @@ -318,7 +318,7 @@ tdbio_sync() return 0; if( !is_locked ) { - if( make_dotlock( lockhandle, -1 ) ) + if( dotlock_take( lockhandle, -1 ) ) log_fatal("can't acquire lock - giving up\n"); else is_locked = 1; @@ -333,7 +333,7 @@ tdbio_sync() } cache_is_dirty = 0; if( did_lock && !opt.lock_once ) { - if( !release_dotlock( lockhandle ) ) + if( !dotlock_release (lockhandle) ) is_locked = 0; } @@ -373,7 +373,7 @@ tdbio_end_transaction() if( !in_transaction ) log_bug("tdbio: no active transaction\n"); if( !is_locked ) { - if( make_dotlock( lockhandle, -1 ) ) + if( dotlock_take( lockhandle, -1 ) ) log_fatal("can't acquire lock - giving up\n"); else is_locked = 1; @@ -383,7 +383,7 @@ tdbio_end_transaction() rc = tdbio_sync(); unblock_all_signals(); if( !opt.lock_once ) { - if( !release_dotlock( lockhandle ) ) + if( !dotlock_release (lockhandle) ) is_locked = 0; } return rc; @@ -423,7 +423,7 @@ static void cleanup(void) { if( is_locked ) { - if( !release_dotlock(lockhandle) ) + if( !dotlock_release (lockhandle) ) is_locked = 0; } } @@ -544,10 +544,10 @@ tdbio_set_dbname( const char *new_dbname, int create ) db_name = fname; #ifdef __riscos__ if( !lockhandle ) - lockhandle = create_dotlock( db_name ); + lockhandle = dotlock_create (db_name); if( !lockhandle ) log_fatal( _("can't create lock for `%s'\n"), db_name ); - if( make_dotlock( lockhandle, -1 ) ) + if( dotlock_make (lockhandle, -1) ) log_fatal( _("can't lock `%s'\n"), db_name ); #endif /* __riscos__ */ oldmask=umask(077); @@ -567,7 +567,7 @@ tdbio_set_dbname( const char *new_dbname, int create ) #ifndef __riscos__ if( !lockhandle ) - lockhandle = create_dotlock( db_name ); + lockhandle = dotlock_create (db_name); if( !lockhandle ) log_fatal( _("can't create lock for `%s'\n"), db_name ); #endif /* !__riscos__ */ @@ -608,11 +608,11 @@ open_db() assert( db_fd == -1 ); if (!lockhandle ) - lockhandle = create_dotlock( db_name ); + lockhandle = dotlock_create (db_name); if (!lockhandle ) log_fatal( _("can't create lock for `%s'\n"), db_name ); #ifdef __riscos__ - if (make_dotlock( lockhandle, -1 ) ) + if (dotlock_take (lockhandle, -1) ) log_fatal( _("can't lock `%s'\n"), db_name ); #endif /* __riscos__ */ #ifdef HAVE_W32CE_SYSTEM |