X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=d2d2beb1ace4f87471cdb5b9396323f9fb3389f8;hb=a047e3e158d560af079bec920460711d8222317c;hp=3e8e8fcf7eb772ff8ca0b7cd8c1289c4d7ddb112;hpb=3b5b9db0bc2dbe93b3b79e722997606c71ecafb9;p=onak.git

diff --git a/merge.c b/merge.c
index 3e8e8fc..d2d2beb 100644
--- a/merge.c
+++ b/merge.c
@@ -6,9 +6,9 @@
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "decodekey.h"
 #include "keydb.h"
@@ -146,7 +146,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 			if (cur->next == NULL) {
 				*list_end = prev;
 			}
-			// TODO: Free the removed signed packet...
+			/*
+			 * TODO: Free the removed signed packet...
+			 */
 		}
 		prev = cur;
 	}
@@ -171,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) {
@@ -191,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;
@@ -316,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;