aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keylist.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-04-29 09:05:24 +0000
committerWerner Koch <[email protected]>2016-04-29 09:05:24 +0000
commit64bfeafa52a5ed3fa82bdc0ce7ef0edddeef188c (patch)
tree820e0e686ef9672b4b05c1e644026840e5710b6a /g10/keylist.c
parentcommon: Improve log_assert. (diff)
downloadgnupg-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/keylist.c')
-rw-r--r--g10/keylist.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/g10/keylist.c b/g10/keylist.c
index 0812d9c9b..1649991c7 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -24,9 +24,8 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <assert.h>
#ifdef HAVE_DOSISH_SYSTEM
-#include <fcntl.h> /* for setmode() */
+# include <fcntl.h> /* for setmode() */
#endif
#include "gpg.h"
@@ -799,7 +798,7 @@ print_subpackets_colon (PKT_signature * sig)
{
byte *i;
- assert (opt.show_subpackets);
+ log_assert (opt.show_subpackets);
for (i = opt.show_subpackets; *i; i++)
{
@@ -1788,9 +1787,9 @@ do_reorder_keyblock (KBNODE keyblock, int attr)
if (node->pkt->pkttype == PKT_USER_ID)
break;
}
- assert (node);
- assert (last); /* The user ID is never the first packet. */
- assert (primary0); /* Ditto (this is the node before primary). */
+ log_assert (node);
+ log_assert (last); /* The user ID is never the first packet. */
+ log_assert (primary0); /* Ditto (this is the node before primary). */
if (node == primary)
return; /* Already the first one. */