summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-09-23 12:28:41 +0200
committerWerner Koch <wk@gnupg.org>2009-09-23 12:28:41 +0200
commit1d0e9816e4a665da90d4798d7814b4e93346d7a9 (patch)
treee6c206190a7b62c709deec56bd88e2d4e964f22d /g10
parent2009-09-23 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-1d0e9816e4a665da90d4798d7814b4e93346d7a9.tar.xz
gnupg2-1d0e9816e4a665da90d4798d7814b4e93346d7a9.zip
s/DOTLOCK/dotlock_t/.
Add some stuff for g13.
Diffstat (limited to 'g10')
-rw-r--r--g10/gpgv.c8
-rw-r--r--g10/keydb.c2
-rw-r--r--g10/keyring.c2
-rw-r--r--g10/tdbio.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 747b05ff2..ba4885b9e 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -500,7 +500,7 @@ disable_dotlock (void)
{
}
-DOTLOCK
+dotlock_t
create_dotlock (const char *file_to_lock)
{
(void)file_to_lock;
@@ -508,13 +508,13 @@ create_dotlock (const char *file_to_lock)
}
void
-destroy_dotlock (DOTLOCK h)
+destroy_dotlock (dotlock_t h)
{
(void)h;
}
int
-make_dotlock (DOTLOCK h, long timeout)
+make_dotlock (dotlock_t h, long timeout)
{
(void)h;
(void)timeout;
@@ -522,7 +522,7 @@ make_dotlock (DOTLOCK h, long timeout)
}
int
-release_dotlock (DOTLOCK h)
+release_dotlock (dotlock_t h)
{
(void)h;
return 0;
diff --git a/g10/keydb.c b/g10/keydb.c
index 398be19d6..55727ff5d 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -78,7 +78,7 @@ static void unlock_all (KEYDB_HANDLE hd);
static int
maybe_create_keyring (char *filename, int force)
{
- DOTLOCK lockhd = NULL;
+ dotlock_t lockhd = NULL;
IOBUF iobuf;
int rc;
mode_t oldmask;
diff --git a/g10/keyring.c b/g10/keyring.c
index 7482724ad..e5a87746e 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -55,7 +55,7 @@ struct keyring_name
struct keyring_name *next;
int secret;
int readonly;
- DOTLOCK lockhd;
+ dotlock_t lockhd;
int is_locked;
int did_full_scan;
char fname[1];
diff --git a/g10/tdbio.c b/g10/tdbio.c
index c0dd5abf4..e65af9a4a 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -86,7 +86,7 @@ struct cmp_xdir_struct {
static char *db_name;
-static DOTLOCK lockhandle;
+static dotlock_t lockhandle;
static int is_locked;
static int db_fd = -1;
static int in_transaction;