multicast/psyc/psycstore api: fix typos / type names

4 files changed, 44 insertions, 16 deletions

diff --git a/src/include/gnunet_env_lib.h b/src/include/gnunet_env_lib.h
index e086882ed..42d9590d5 100644
--- a/src/include/gnunet_env_lib.h
+++ b/src/include/gnunet_env_lib.h
@@ -26,6 +26,18 @@
  */
 
 
+#ifndef GNUNET_ENV_LIB_H
+#define GNUNET_ENV_LIB_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
 /** 
  * Possible operations on PSYC state (persistent) and transient variables (per message).
  */
@@ -85,7 +97,7 @@ struct GNUNET_ENV_Modifier {
   /** 
    * State operation.
    */
-  GNUNET_ENV_Operator oper;
+  enum GNUNET_ENV_Operator oper;
 
   /** 
    * Variable name.
@@ -213,7 +225,7 @@ GNUNET_ENV_value_to_number (size_t size, const void *value, int64_t *number);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if an error occurred (e.g. the value is invalid).
  */
 int
-GNUNET_ENV_value_to_list (size_t size, const void *value, GNUNET_CONTAINER_SList **list);
+GNUNET_ENV_value_to_list (size_t size, const void *value, struct GNUNET_CONTAINER_SList **list);
 
 
 /** 
@@ -226,7 +238,7 @@ GNUNET_ENV_value_to_list (size_t size, const void *value, GNUNET_CONTAINER_SList
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if an error occurred (e.g. the value is invalid).
  */
 int
-GNUNET_ENV_value_to_dict (size_t size, const void *value, GNUNET_CONTAINER_MultiHashMap **dict);
+GNUNET_ENV_value_to_dict (size_t size, const void *value, struct GNUNET_CONTAINER_MultiHashMap **dict);
 
 
 /** 
@@ -250,7 +262,7 @@ GNUNET_ENV_value_from_number (int64_t number, size_t *value_size);
  * @return A newly allocated value or NULL on error.
  */
 void *
-GNUNET_ENV_value_from_list (GNUNET_CONTAINER_SList *list, size_t *value_size);
+GNUNET_ENV_value_from_list (struct GNUNET_CONTAINER_SList *list, size_t *value_size);
 
 
 /** 
@@ -262,4 +274,16 @@ GNUNET_ENV_value_from_list (GNUNET_CONTAINER_SList *list, size_t *value_size);
  * @return A newly allocated value or NULL on error.
  */
 void *
-GNUNET_ENV_value_from_dict (GNUNET_CONTAINER_MultiHashMap *dict, size_t *value_size);
+GNUNET_ENV_value_from_dict (struct GNUNET_CONTAINER_MultiHashMap *dict, size_t *value_size);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/* ifndef GNUNET_ENV_LIB_H */
+#endif
+/* end of gnunet_env_lib.h */
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 01074358e..edd4984a2 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -314,7 +314,7 @@ GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *jh,
  */
 typedef void
 (*GNUNET_MULTICAST_JoinCallback) (void *cls,
-                                  const struct GNUNET_EccPublicKey *member_key,
+                                  const struct GNUNET_CRYPTO_EccPublicKey *member_key,
                                   const struct GNUNET_MessageHeader *join_req,
                                   struct GNUNET_MULTICAST_JoinHandle *jh);
 
@@ -370,7 +370,7 @@ typedef void
  */
 typedef void
 (*GNUNET_MULTICAST_RequestCallback) (void *cls,
-                                     const struct GNUNET_EccPublicKey *member_key,
+                                     const struct GNUNET_CRYPTO_EccPublicKey *member_key,
                                      const struct GNUNET_MessageHeader *req,
                                      enum GNUNET_MULTICAST_MessageFlags flags);
 
@@ -580,8 +580,9 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                const struct GNUNET_CRYPTO_EccPrivateKey *priv_key,
                                uint64_t last_fragment_id,
                                GNUNET_MULTICAST_JoinCallback join_cb,
-                               GNUNET_MULITCAST_MembershipTestCallback test_cb,
-                               GNUNET_MULITCAST_ReplayCallback replay_cb,
+                               GNUNET_MULTICAST_MembershipTestCallback test_cb,
+                               GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
+                               GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb,
                                GNUNET_MULTICAST_RequestCallback request_cb,
                                GNUNET_MULTICAST_MessageCallback message_cb,
                                void *cls);
@@ -694,8 +695,9 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               const struct GNUNET_PeerIdentity *relays,
                               const struct GNUNET_MessageHeader *join_request,
                               GNUNET_MULTICAST_JoinCallback join_cb,
-                              GNUNET_MULITCAST_MembershipTestCallback test_cb,
-                              GNUNET_MULITCAST_ReplayCallback replay_cb,
+                              GNUNET_MULTICAST_MembershipTestCallback test_cb,
+                              GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb,
+                              GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb,
                               GNUNET_MULTICAST_MessageCallback message_cb,
                               void *cls);
 
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 7caf8a40f..8e43b387e 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -86,7 +86,7 @@ extern "C"
 #endif
 
 #include "gnunet_util_lib.h"
-#include "gnunet_psyc_lib.h"
+#include "gnunet_env_lib.h"
 #include "gnunet_multicast_service.h"
 
 
@@ -219,7 +219,7 @@ typedef int
                        uint64_t message_id,
                        const char *method_name,
                        size_t modifier_count,
-                       const GNUNET_ENV_Modifier *modifiers,
+                       const struct GNUNET_ENV_Modifier *modifiers,
                        uint64_t data_offset,
                        size_t data_size,
                        const void *data,
@@ -243,7 +243,7 @@ typedef int
                              const struct GNUNET_CRYPTO_EccPublicKey *slave_key,
                              const char *method_name,
                              size_t variable_count,
-                             const GNUNET_ENV_Modifier *variables,
+                             const struct GNUNET_ENV_Modifier *variables,
                              size_t data_size,
                              const void *data,
                              struct GNUNET_PSYC_JoinHandle *jh);
@@ -398,7 +398,7 @@ GNUNET_PSYC_master_transmit (struct GNUNET_PSYC_Master *master,
                              const struct GNUNET_ENV_Environment *env,
                              GNUNET_PSYC_MasterTransmitNotify notify,
                              void *notify_cls,
-                             enum GNUNET_PSYC_TransmitFlags flags);
+                             enum GNUNET_PSYC_MasterTransmitFlags flags);
 
 
 /** 
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index 8fc7dbcd7..660ad0a2a 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -37,6 +37,8 @@ extern "C"
 
 #include "gnunet_util_lib.h"
 #include "gnunet_env_lib.h"
+#include "gnunet_multicast_service.h"
+#include "gnunet_psyc_service.h"
 
 /** 
  * Version number of GNUnet PSYCstore API.
@@ -107,7 +109,7 @@ typedef void
  */
 struct GNUNET_PSYCSTORE_OperationHandle *
 GNUNET_PSYCSTORE_counters_get (struct GNUNET_PSYCSTORE_Handle *h,
-                               GNUNET_CRYPTO_EccPublicKey *channel_key,
+                               struct GNUNET_CRYPTO_EccPublicKey *channel_key,
                                GNUNET_PSYCSTORE_CountersCallback *cb,
                                void *cb_cls);