X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=cleankey.c;h=4d1ec1c890424f347281f52655bbe31c248ce50c;hb=a047e3e158d560af079bec920460711d8222317c;hp=b236fa38c6e7fca5918bfb21577f832f30a1cff6;hpb=cfbbd6655346497ab28d50d2b5c34f0c5d9ce5ce;p=onak.git diff --git a/cleankey.c b/cleankey.c index b236fa3..4d1ec1c 100644 --- a/cleankey.c +++ b/cleankey.c @@ -4,11 +4,8 @@ * Jonathan McDowell * * Copyright 2004 Project Purple - * - * $Id: cleankey.c,v 1.1 2004/05/31 14:16:49 noodles Exp $ */ -#include #include #include #include @@ -33,7 +30,7 @@ int dedupuids(struct openpgp_publickey *key) 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); @@ -50,7 +47,7 @@ int dedupuids(struct openpgp_publickey *key) 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);