From: Julius Bünger <buenger@mytum.de>
Date: Tue, 18 Sep 2018 16:37:27 +0000 (+0200)
Subject: Remove redundant type definition
X-Git-Tag: v0.11.0~247
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c50386476c7a79efd87d4b1b36f9c740d74dd9f8;p=oweals%2Fgnunet.git

Remove redundant type definition
---

diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index eda012076..22e944d0f 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -63,24 +63,6 @@ typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls,
     uint64_t num_peers,
     const struct GNUNET_PeerIdentity *peers);
 
-/**
- * Callback called when view was updated
- *
- * @param num_peers the number of peers returned
- * @param peers array with num_peers PeerIDs
- */
-typedef void (* GNUNET_RPS_ViewUpdateCB) (void *cls,
-    uint64_t num_peers,
-    const struct GNUNET_PeerIdentity *peers);
-
-/**
- * Callback called when a peer from the biased stream was received
- *
- * @param peer The received peer
- */
-typedef void (* GNUNET_RPS_StreamInputCB) (void *cls,
-    uint64_t num_peers,
-    const struct GNUNET_PeerIdentity *peer);
 
 /**
  * Connect to the rps service
@@ -167,7 +149,7 @@ GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
 void
 GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
                          uint32_t num_updates,
-                         GNUNET_RPS_ViewUpdateCB view_update_cb,
+                         GNUNET_RPS_NotifyReadyCB view_update_cb,
                          void *cls);
 
 
@@ -183,7 +165,7 @@ GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
 void
 GNUNET_RPS_stream_request (struct GNUNET_RPS_Handle *rps_handle,
                            uint32_t num_updates,
-                           GNUNET_RPS_StreamInputCB stream_input_cb,
+                           GNUNET_RPS_NotifyReadyCB stream_input_cb,
                            void *cls);
 
 
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 96660ded6..00f817468 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -58,7 +58,7 @@ struct GNUNET_RPS_Handle
   /**
    * @brief Callback called on each update of the view
    */
-  GNUNET_RPS_ViewUpdateCB view_update_cb;
+  GNUNET_RPS_NotifyReadyCB view_update_cb;
 
   /**
    * @brief Closure to each requested update of the view
@@ -68,7 +68,7 @@ struct GNUNET_RPS_Handle
   /**
    * @brief Callback called on each peer of the biased input stream
    */
-  GNUNET_RPS_StreamInputCB stream_input_cb;
+  GNUNET_RPS_NotifyReadyCB stream_input_cb;
 
   /**
    * @brief Closure to each requested peer from the biased stream
@@ -270,7 +270,7 @@ handle_reply (void *cls,
 void
 GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
                          uint32_t num_updates,
-                         GNUNET_RPS_ViewUpdateCB view_update_cb,
+                         GNUNET_RPS_NotifyReadyCB view_update_cb,
                          void *cls)
 {
   struct GNUNET_MQ_Envelope *ev;
@@ -300,7 +300,7 @@ GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
 void
 GNUNET_RPS_stream_request (struct GNUNET_RPS_Handle *rps_handle,
                            uint32_t num_peers,
-                           GNUNET_RPS_StreamInputCB stream_input_cb,
+                           GNUNET_RPS_NotifyReadyCB stream_input_cb,
                            void *cls)
 {
   struct GNUNET_MQ_Envelope *ev;