openpgp: Rename ComponentBinding to ComponentBundle, etc.

  - Likewise KeyBinding, UserIDBinding, UserAttributeBinding,
    UnknownBinding, etc.

  - Reason: a self-signature on a component is a binding, but
    revocations and TPSes are not bindings.

  - Consistently call collections of components and associated
    signatures bundles now.  Likewise for fields, methods.

  - Fixes #425.

2 files changed, 11 insertions, 11 deletions

diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h
index 83c7416e..647bc4af 100644
--- a/openpgp-ffi/include/sequoia/openpgp.h
+++ b/openpgp-ffi/include/sequoia/openpgp.h
@@ -584,7 +584,7 @@ pgp_packet_t pgp_literal_into_packet (pgp_literal_t literal);
 /*/
 void pgp_literal_free (pgp_literal_t literal);
 
-/* openpgp::cert::UserIDBinding.  */
+/* openpgp::cert::UserIDBundle.  */
 
 /*/
 /// Returns the user id.
@@ -595,25 +595,25 @@ void pgp_literal_free (pgp_literal_t literal);
 ///
 /// The caller must free the returned value.
 /*/
-char *pgp_user_id_binding_user_id (pgp_user_id_binding_t binding);
+char *pgp_user_id_bundle_user_id (pgp_user_id_bundle_t binding);
 
 /*/
 /// Returns a reference to the self-signature, if any.
 /*/
-pgp_signature_t pgp_user_id_binding_selfsig(pgp_user_id_binding_t binding,
+pgp_signature_t pgp_user_id_bundle_selfsig(pgp_user_id_bundle_t binding,
                                             pgp_policy_t policy);
 
-/* openpgp::cert::UserIDBindingIter.  */
+/* openpgp::cert::UserIDBundleIter.  */
 
 /*/
 /// Returns the next element in the iterator.
 /*/
-pgp_user_id_binding_t pgp_user_id_binding_iter_next (pgp_user_id_binding_iter_t iter);
+pgp_user_id_bundle_t pgp_user_id_bundle_iter_next (pgp_user_id_bundle_iter_t iter);
 
 /*/
-/// Frees an pgp_user_id_binding_iter_t.
+/// Frees an pgp_user_id_bundle_iter_t.
 /*/
-void pgp_user_id_binding_iter_free (pgp_user_id_binding_iter_t iter);
+void pgp_user_id_bundle_iter_free (pgp_user_id_bundle_iter_t iter);
 
 /* openpgp::cert::KeyIter.  */
 
@@ -940,9 +940,9 @@ pgp_cert_t pgp_cert_set_expiry(pgp_error_t *errp,
 int pgp_cert_is_tsk(pgp_cert_t cert);
 
 /*/
-/// Returns an iterator over the `UserIDBinding`s.
+/// Returns an iterator over the `UserIDBundle`s.
 /*/
-pgp_user_id_binding_iter_t pgp_cert_user_id_binding_iter (pgp_cert_t cert);
+pgp_user_id_bundle_iter_t pgp_cert_user_id_binding_iter (pgp_cert_t cert);
 
 /*/
 /// Returns an iterator over all `Key`s in a Cert.
diff --git a/openpgp-ffi/include/sequoia/openpgp/types.h b/openpgp-ffi/include/sequoia/openpgp/types.h
index 7a8eb83a..e99413d0 100644
--- a/openpgp-ffi/include/sequoia/openpgp/types.h
+++ b/openpgp-ffi/include/sequoia/openpgp/types.h
@@ -366,12 +366,12 @@ typedef struct pgp_packet_pile *pgp_packet_pile_t;
 /*/
 /// A `UserIDBinding`.
 /*/
-typedef struct pgp_user_id_binding *pgp_user_id_binding_t;
+typedef struct pgp_user_id_bundle *pgp_user_id_bundle_t;
 
 /*/
 /// An iterator over `UserIDBinding`s.
 /*/
-typedef struct pgp_user_id_binding_iter *pgp_user_id_binding_iter_t;
+typedef struct pgp_user_id_bundle_iter *pgp_user_id_bundle_iter_t;
 
 /*/
 /// An iterator over keys in a Cert.