cscvs to tla changeset 78

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index cfe2d97d1c2711bfbb74d79eeba4b2d37f498c0f..6ed0a2d139a40af796251862a7cb624f4fc6deeb 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -4,17 +4,21 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $
  */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 
@@ -353,7 +357,6 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 /**
  *     update_keys - Takes a list of public keys and updates them in the DB.
  *     @keys: The keys to update in the DB.
- *     @verbose: Should we output more information as we add keys?
  *
  *     Takes a list of keys and adds them to the database, merging them with
  *     the key in the database if it's already present there. The key list is
@@ -361,7 +364,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
  *     we had before to what we have now (ie the set of data that was added to
  *     the DB). Returns the number of entirely new keys added.
  */
-int update_keys(struct openpgp_publickey **keys, bool verbose)
+int update_keys(struct openpgp_publickey **keys)
 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
@@ -371,13 +374,10 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
                intrans = starttrans();
-               if (verbose) {
-                       fprintf(stderr, "Fetching key 0x%llX, result: %d\n",
-                               get_keyid(curkey),
-                               fetch_key(get_keyid(curkey), &oldkey, intrans));
-               } else {
-                       fetch_key(get_keyid(curkey), &oldkey, intrans);
-               }
+               logthing(LOGTHING_INFO,
+                       "Fetching key 0x%llX, result: %d",
+                       get_keyid(curkey),
+                       fetch_key(get_keyid(curkey), &oldkey, intrans));
 
                /*
                 * If we already have the key stored in the DB then merge it
@@ -394,25 +394,21 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
                                        *keys = curkey->next;
                                } else {
                                        prev->next = curkey->next;
-                                       prev = curkey->next;
                                        curkey->next = NULL;
                                        free_publickey(curkey);
+                                       curkey = prev;
                                }
                        } else {
                                prev = curkey;
-                               if (verbose) {
-                                       fprintf(stderr,
-                                       "Merged key; storing updated key.\n");
-                               }
+                               logthing(LOGTHING_INFO,
+                                       "Merged key; storing updated key.");
                                store_key(oldkey, intrans, true);
                        }
                        free_publickey(oldkey);
                        oldkey = NULL;
                } else {
-                       if (verbose) {
-                               fprintf(stderr,
-                                       "Storing completely new key.\n");
-                       }
+                       logthing(LOGTHING_INFO,
+                               "Storing completely new key.");
                        store_key(curkey, intrans, false);
                        newkeys++;
                }