cscvs to tla changeset 107

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index f2981720dc1ee8a1d6f08b1984de048b063f1b86..3ec64f3ed98b824e5263e7b86b4e5eacec81a78b 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: merge.h,v 1.5 2003/06/04 20:57:11 noodles Exp $
  */
 
 #ifndef __MERGE_H__
@@ -28,7 +30,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
@@ -36,6 +37,6 @@ 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);
 
 #endif