projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change to using Autoconf version string.
[onak.git]
/
parsekey.c
diff --git
a/parsekey.c
b/parsekey.c
index fb9cf83e25b0ce33c0a0a4b2e454cebd04c179d6..687fd9bd8612c6f9a3cd2c41af96e9269368a620 100644
(file)
--- a/
parsekey.c
+++ b/
parsekey.c
@@
-6,7
+6,6
@@
* Copyright 2002 Project Purple
*/
* Copyright 2002 Project Purple
*/
-#include <assert.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@
-52,7
+51,7
@@
int parse_keys(struct openpgp_packet_list *packets,
* key (it should be a revocation), to the current UID
* or the current subkey.
*/
* key (it should be a revocation), to the current UID
* or the current subkey.
*/
- assert(curkey != NULL);
+
log_
assert(curkey != NULL);
if (curkey->subkeys != NULL) {
ADD_PACKET_TO_LIST_END(curkey->last_subkey,
sig,
if (curkey->subkeys != NULL) {
ADD_PACKET_TO_LIST_END(curkey->last_subkey,
sig,
@@
-88,8
+87,8
@@
int parse_keys(struct openpgp_packet_list *packets,
/*
* It's a UID packet (or a photo id, which is similar).
*/
/*
* It's a UID packet (or a photo id, which is similar).
*/
- assert(curkey != NULL);
- assert(curkey->subkeys == NULL);
+
log_
assert(curkey != NULL);
+
log_
assert(curkey->subkeys == NULL);
ADD_PACKET_TO_LIST_END(curkey,
uid,
packet_dup(packets->packet));
ADD_PACKET_TO_LIST_END(curkey,
uid,
packet_dup(packets->packet));
@@
-98,7
+97,7
@@
int parse_keys(struct openpgp_packet_list *packets,
/*
* It's a subkey packet.
*/
/*
* It's a subkey packet.
*/
- assert(curkey != NULL);
+
log_
assert(curkey != NULL);
ADD_PACKET_TO_LIST_END(curkey,
subkey,
packet_dup(packets->packet));
ADD_PACKET_TO_LIST_END(curkey,
subkey,
packet_dup(packets->packet));
@@
-164,7
+163,7
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
int keys = 0;
bool inpacket = false;
int keys = 0;
bool inpacket = false;
- assert(packets != NULL);
+
log_
assert(packets != NULL);
curpacket = *packets;
if (curpacket != NULL) {
while (curpacket->next != NULL) {
curpacket = *packets;
if (curpacket != NULL) {
while (curpacket->next != NULL) {