Update Debian Vcs-* fields to point to git repository

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index da8534ff59232ceb31b688e4a72fbf3d80caad05..794bd270ccd37e5ab1deb2ffb9d67a0b46c44d01 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -1,17 +1,36 @@
 /*
  * merge.h - Routines to merge OpenPGP public keys.
  *
 /*
  * merge.h - Routines to merge OpenPGP public keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.

  *
  *

- * $Id: merge.h,v 1.6 2004/05/31 14:16:49 noodles Exp $
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #ifndef __MERGE_H__
 
 #include "keystructs.h"
 
  */
 
 #ifndef __MERGE_H__
 
 #include "keystructs.h"
 

+/**
+ *     compare_packets - Check to see if 2 OpenPGP packets are the same.
+ *     @a: The first packet to compare.
+ *     @b: The second packet to compare.
+ *
+ *     Takes 2 packets and returns 0 if they are the same, -1 if a is
+ *      less than b, or 1 if a is greater than b.
+ */
+int compare_packets(struct openpgp_packet *a, struct openpgp_packet *b);
+

 /**
  *     merge_keys - Takes 2 public keys and merges them.
  *     @a: The old key. The merged key is returned in this structure.
 /**
  *     merge_keys - Takes 2 public keys and merges them.
  *     @a: The old key. The merged key is returned in this structure.


@@ -28,16 +47,15 @@
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
 /**
 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.
+ *     find_packet - Checks to see if an OpenPGP packet exists in a list.
+ *     @packet_list: The list of packets to look in.
+ *     @packet: The packet to look for.

  *
  *

- *     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
- *     update to contain the minimum set of updates required to get from what
- *     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.
+ *     Walks through the packet_list checking to see if the packet given is
+ *     present in it. Returns true if it is.

  */
  */

-int update_keys(struct openpgp_publickey **keys);
+bool find_packet(struct openpgp_packet_list *packet_list,
+                       struct openpgp_packet *packet);

 
 /**
  *     get_signed_packet - Gets a signed packet from a list.
 
 /**
  *     get_signed_packet - Gets a signed packet from a list.