Cleanup logging in sixdegrees.c

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index c51474c753bd06b0866878d284159771e4cdcebe..d2d2beb1ace4f87471cdb5b9396323f9fb3389f8 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -4,11 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: merge.c,v 1.11 2003/06/07 13:45:35 noodles Exp $

  */
 
  */
 

-#include <assert.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -176,7 +173,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
        struct openpgp_packet_list      *curpacket = NULL;
        struct openpgp_packet_list      *nextpacket = NULL;
 
        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) {
 
        curpacket = new->sigs;
        while (curpacket != NULL) {


@@ -196,7 +193,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
                        if (lastpacket != NULL) {
                                lastpacket->next = curpacket->next;
                        } else {
                        if (lastpacket != NULL) {
                                lastpacket->next = curpacket->next;
                        } else {

-                               assert(curpacket == new->sigs);
+                               log_assert(curpacket == new->sigs);

                                new->sigs = curpacket->next;
                        }
                        curpacket->next = NULL;
                                new->sigs = curpacket->next;
                        }
                        curpacket->next = NULL;


@@ -321,7 +318,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
                                if (lastpacket != NULL) {
                                        lastpacket->next = curpacket->next;
                                } else {
                                if (lastpacket != NULL) {
                                        lastpacket->next = curpacket->next;
                                } else {

-                                       assert(curpacket == b->revocations);
+                                       log_assert(curpacket == b->revocations);

                                        b->revocations = curpacket->next;
                                }
                                curpacket->next = NULL;
                                        b->revocations = curpacket->next;
                                }
                                curpacket->next = NULL;