diff options
| author | Werner Koch <[email protected]> | 2016-04-29 09:05:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-04-29 09:05:24 +0000 |
| commit | 64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c (patch) | |
| tree | 820e0e686ef9672b4b05c1e644026840e5710b6a /g10/keydb.c | |
| parent | common: Improve log_assert. (diff) | |
| download | gnupg-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.tar.gz gnupg-64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c.zip | |
gpg: Remove all assert.h and s/assert/log_assert/.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keydb.c')
| -rw-r--r-- | g10/keydb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index 960480708..016434817 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <assert.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -861,7 +860,7 @@ keydb_new (void) hd->saved_found = -1; hd->is_reset = 1; - assert (used_resources <= MAX_KEYDB_RESOURCES); + log_assert (used_resources <= MAX_KEYDB_RESOURCES); for (i=j=0; ! die && i < used_resources; i++) { switch (all_resources[i].type) @@ -919,7 +918,7 @@ keydb_release (KEYDB_HANDLE hd) if (!hd) return; - assert (active_handles > 0); + log_assert (active_handles > 0); active_handles--; unlock_all (hd); @@ -1521,8 +1520,8 @@ keydb_update_keyblock (KEYDB_HANDLE hd, kbnode_t kb) KEYDB_SEARCH_DESC desc; size_t len; - assert (kb); - assert (kb->pkt->pkttype == PKT_PUBLIC_KEY); + log_assert (kb); + log_assert (kb->pkt->pkttype == PKT_PUBLIC_KEY); pk = kb->pkt->pkt.public_key; if (!hd) @@ -1549,7 +1548,7 @@ keydb_update_keyblock (KEYDB_HANDLE hd, kbnode_t kb) err = keydb_search (hd, &desc, 1, NULL); if (err) return gpg_error (GPG_ERR_VALUE_NOT_FOUND); - assert (hd->found >= 0 && hd->found < hd->used); + log_assert (hd->found >= 0 && hd->found < hd->used); switch (hd->active[hd->found].type) { |