Cleanup logging in sixdegrees.c

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 33924f05e3078b886a94afb702b4e331b9a9f51f..d2d2beb1ace4f87471cdb5b9396323f9fb3389f8 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -6,7 +6,6 @@
  * Copyright 2002 Project Purple
  */
 
  * Copyright 2002 Project Purple
  */
 

-#include <assert.h>

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


@@ -147,7 +146,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }

-                       // TODO: Free the removed signed packet...
+                       /*
+                        * TODO: Free the removed signed packet...
+                        */

                }
                prev = cur;
        }
                }
                prev = cur;
        }


@@ -172,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) {


@@ -192,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;


@@ -317,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;