cscvs to tla changeset 130

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 3e8e8fcf7eb772ff8ca0b7cd8c1289c4d7ddb112..c51474c753bd06b0866878d284159771e4cdcebe 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -4,11 +4,14 @@
  * 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 <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 
 #include "decodekey.h"
 #include "keydb.h"
 
 #include "decodekey.h"
 #include "keydb.h"


@@ -146,7 +149,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;
        }