projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only seed database for Debian install if we're using default config
[onak.git]
/
cleankey.c
diff --git
a/cleankey.c
b/cleankey.c
index b236fa38c6e7fca5918bfb21577f832f30a1cff6..4d1ec1c890424f347281f52655bbe31c248ce50c 100644
(file)
--- a/
cleankey.c
+++ b/
cleankey.c
@@
-4,11
+4,8
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2004 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2004 Project Purple
- *
- * $Id: cleankey.c,v 1.1 2004/05/31 14:16:49 noodles Exp $
*/
*/
-#include <assert.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@
-33,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);
@@
-50,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);