X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/394938c479925750ffe56c28d281945ba4003a14..a241edc87bed49d6bc5dc3c4c99786a921ae7c8a:/cleankey.c

diff --git a/cleankey.c b/cleankey.c
index f3110cc..d4046f3 100644
--- a/cleankey.c
+++ b/cleankey.c
@@ -1,12 +1,22 @@
 /*
  * cleankey.c - Routines to look for common key problems and clean them up.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +41,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);
@@ -48,7 +58,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);