-revise API naming; cleanups

2 files changed, 27 insertions, 27 deletions

diff --git a/src/identity-provider/gnunet-idp.c b/src/identity-provider/gnunet-idp.c
index bc30a1148f..d6544eb3b4 100644
--- a/src/identity-provider/gnunet-idp.c
+++ b/src/identity-provider/gnunet-idp.c
@@ -193,20 +193,20 @@ iter_finished (void *cls)
   }
 
   if (issue_attrs) {
-    idp_op = GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (idp_handle,
-                                                        pkey,
-                                                        &rp_key,
-                                                        attr_list,
-                                                        &ticket_issue_cb,
-                                                        NULL);
+    idp_op = GNUNET_IDENTITY_PROVIDER_ticket_issue (idp_handle,
+                                                    pkey,
+                                                    &rp_key,
+                                                    attr_list,
+                                                    &ticket_issue_cb,
+                                                    NULL);
     return;
   }
   if (consume_ticket) {
-    idp_op = GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (idp_handle,
-                                                         pkey,
-                                                         &ticket,
-                                                         &process_attrs,
-                                                         NULL);
+    idp_op = GNUNET_IDENTITY_PROVIDER_ticket_consume (idp_handle,
+                                                      pkey,
+                                                      &ticket,
+                                                      &process_attrs,
+                                                      NULL);
     return;
   }
   attr = GNUNET_IDENTITY_PROVIDER_attribute_new (attr_name,
diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c
index d623eaf3b0..33468cc13d 100644
--- a/src/identity-provider/identity_provider_api.c
+++ b/src/identity-provider/identity_provider_api.c
@@ -1027,12 +1027,12 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
-                                           const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss,
-                                           const struct GNUNET_CRYPTO_EcdsaPublicKey *rp,
-                                           const struct GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
-                                           GNUNET_IDENTITY_PROVIDER_TicketCallback cb,
-                                           void *cb_cls)
+GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+                                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss,
+                                       const struct GNUNET_CRYPTO_EcdsaPublicKey *rp,
+                                       const struct GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
+                                       GNUNET_IDENTITY_PROVIDER_TicketCallback cb,
+                                       void *cb_cls)
 {
   struct GNUNET_IDENTITY_PROVIDER_Operation *op;
   struct TicketIssueMessage *tim;
@@ -1076,8 +1076,8 @@ GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handl
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
-                                            const struct GNUNET_CRYPTO_EcdsaPrivateKey * identity,
+GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+                                            const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
                                             const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
                                             GNUNET_IDENTITY_PROVIDER_AttributeResult cb,
                                             void *cb_cls)
@@ -1129,14 +1129,14 @@ GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Hand
  * @return an iterator handle to use for iteration
  */
 struct GNUNET_IDENTITY_PROVIDER_TicketIterator *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
-                                                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-                                                     GNUNET_SCHEDULER_TaskCallback error_cb,
-                                                     void *error_cb_cls,
-                                                     GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
-                                                     void *proc_cls,
-                                                     GNUNET_SCHEDULER_TaskCallback finish_cb,
-                                                     void *finish_cb_cls)
+GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h,
+                                                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+                                                 GNUNET_SCHEDULER_TaskCallback error_cb,
+                                                 void *error_cb_cls,
+                                                 GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
+                                                 void *proc_cls,
+                                                 GNUNET_SCHEDULER_TaskCallback finish_cb,
+                                                 void *finish_cb_cls)
 {
   struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it;
   struct GNUNET_CRYPTO_EcdsaPublicKey identity_pub;