X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3eae5368f1c625257a93a18bec49a5a500b3f78e..8b4052ad6015aa9f54c9c824f28655f230d09d8d:/merge.c?ds=sidebyside

diff --git a/merge.c b/merge.c
index 18882e9..d2d2beb 100644
--- a/merge.c
+++ b/merge.c
@@ -6,7 +6,6 @@
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -174,7 +173,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 	struct openpgp_packet_list	*curpacket = NULL;
 	struct openpgp_packet_list	*nextpacket = NULL;
 
-	assert(compare_packets(old->packet, new->packet));
+	log_assert(compare_packets(old->packet, new->packet));
 
 	curpacket = new->sigs;
 	while (curpacket != NULL) {
@@ -194,7 +193,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 			if (lastpacket != NULL) {
 				lastpacket->next = curpacket->next;
 			} else {
-				assert(curpacket == new->sigs);
+				log_assert(curpacket == new->sigs);
 				new->sigs = curpacket->next;
 			}
 			curpacket->next = NULL;
@@ -319,7 +318,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 				if (lastpacket != NULL) {
 					lastpacket->next = curpacket->next;
 				} else {
-					assert(curpacket == b->revocations);
+					log_assert(curpacket == b->revocations);
 					b->revocations = curpacket->next;
 				}
 				curpacket->next = NULL;