projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow db4 backend to compile with later versions of Berkeley DB
[onak.git]
/
cleankey.c
diff --git
a/cleankey.c
b/cleankey.c
index f3110cc8efba3ccecb05e05deb97d69b1ac2bf49..4d1ec1c890424f347281f52655bbe31c248ce50c 100644
(file)
--- a/
cleankey.c
+++ b/
cleankey.c
@@
-6,7
+6,6
@@
* Copyright 2004 Project Purple
*/
* Copyright 2004 Project Purple
*/
-#include <assert.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@
-31,7
+30,7
@@
int dedupuids(struct openpgp_publickey *key)
struct openpgp_signedpacket_list *tmp = NULL;
int merged = 0;
struct openpgp_signedpacket_list *tmp = NULL;
int merged = 0;
- assert(key != NULL);
+
log_
assert(key != NULL);
curuid = key->uids;
while (curuid != NULL) {
dup = find_signed_packet(curuid->next, curuid->packet);
curuid = key->uids;
while (curuid != NULL) {
dup = find_signed_packet(curuid->next, curuid->packet);
@@
-48,7
+47,7
@@
int dedupuids(struct openpgp_publickey *key)
while (tmp != NULL && tmp->next != dup) {
tmp = tmp->next;
}
while (tmp != NULL && tmp->next != dup) {
tmp = tmp->next;
}
- assert(tmp != NULL);
+
log_
assert(tmp != NULL);
tmp->next = dup->next;
dup->next = NULL;
free_signedpacket_list(dup);
tmp->next = dup->next;
dup->next = NULL;
free_signedpacket_list(dup);