Update Debian Vcs-* fields to point to git repository

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index cabbc1886a35db8e26654690ba065b51f4185db7..794bd270ccd37e5ab1deb2ffb9d67a0b46c44d01 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -1,15 +1,36 @@
 /*
  * 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-2004 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.
+ *
+ * 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"
 
+/**
+ *     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.
@@ -25,6 +46,17 @@
  */
 int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b);
 
+/**
+ *     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.
+ *
+ *     Walks through the packet_list checking to see if the packet given is
+ *     present in it. Returns true if it is.
+ */
+bool find_packet(struct openpgp_packet_list *packet_list,
+                       struct openpgp_packet *packet);
+
 /**
  *     get_signed_packet - Gets a signed packet from a list.
  *     @packet_list: The list of packets to look in.