From d2a6a96a87f2bfd2b80f4c56bd6e4e9002dde1fa Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 23 Mar 2013 23:29:49 +0000 Subject: [PATCH] -doxygen fixes --- src/arm/arm_api.c | 28 +++++++++---------- src/arm/gnunet-arm.c | 11 ++++---- src/chat/gnunet-service-chat.c | 2 -- src/consensus/ibf.c | 2 +- src/consensus/ibf.h | 4 +-- src/include/gnunet_arm_service.h | 4 ++- .../gnunet-service-transport_neighbours.c | 6 ---- .../gnunet-service-transport_neighbours.h | 2 -- src/transport/gnunet-transport.c | 2 -- 9 files changed, 25 insertions(+), 36 deletions(-) diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 49cc55315..9b235f023 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -444,29 +444,29 @@ GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param h the handle that was being used */ void -GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *handle) +GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); - if (NULL != handle->cth) + if (NULL != h->cth) { - GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth); - handle->cth = NULL; + GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth); + h->cth = NULL; } - clear_pending_messages (handle, GNUNET_ARM_REQUEST_DISCONNECTED); - if (NULL != handle->client) + clear_pending_messages (h, GNUNET_ARM_REQUEST_DISCONNECTED); + if (NULL != h->client) { - GNUNET_CLIENT_disconnect (handle->client); - handle->client = NULL; + GNUNET_CLIENT_disconnect (h->client); + h->client = NULL; } - if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task) + if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task) { - GNUNET_SCHEDULER_cancel (handle->reconnect_task); - handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_SCHEDULER_cancel (h->reconnect_task); + h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; } - if (GNUNET_NO == handle->service_test_is_active) + if (GNUNET_NO == h->service_test_is_active) { - GNUNET_CONFIGURATION_destroy (handle->cfg); - GNUNET_free (handle); + GNUNET_CONFIGURATION_destroy (h->cfg); + GNUNET_free (h); } } diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 3d94fed80..aae8b9eda 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -248,11 +248,10 @@ static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t * @param arm handle to the ARM connection * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, * GNUNET_SYSERR on error. - * @param error GNUNET_YES if we encountered a permanent error, and there - * will be no re-connection. */ static void -conn_status (void *cls, struct GNUNET_ARM_Handle *arm, char connected) +conn_status (void *cls, struct GNUNET_ARM_Handle *arm, + int connected) { if (GNUNET_SYSERR == connected) { @@ -576,13 +575,13 @@ run (void *cls, char *const *args, const char *cfgfile, else GNUNET_free (armconfig); } - h = GNUNET_ARM_connect (cfg, conn_status, NULL); + h = GNUNET_ARM_connect (cfg, &conn_status, NULL); if (NULL != h) { - m = GNUNET_ARM_monitor (cfg, srv_status, NULL); + m = GNUNET_ARM_monitor (cfg, &srv_status, NULL); if (NULL != m) { - GNUNET_SCHEDULER_add_now (action_loop, NULL); + GNUNET_SCHEDULER_add_now (&action_loop, NULL); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, shutdown_task, NULL); } diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index e01143cf7..9c3fcfb39 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c @@ -1358,8 +1358,6 @@ handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, * @param cls closure, always NULL * @param other the other peer involved * @param message the actual message - * @param atsi performance information - * @param atsi_count number of entries in atsi * @return GNUNET_OK to keep the connection open, * GNUNET_SYSERR to close it (signal serious error) */ diff --git a/src/consensus/ibf.c b/src/consensus/ibf.c index 2d2949334..87dbdd696 100644 --- a/src/consensus/ibf.c +++ b/src/consensus/ibf.c @@ -174,7 +174,7 @@ ibf_is_empty (struct InvertibleBloomFilter *ibf) * @param ret_side sign of the cell's count where the decoded element came from. * A negative sign indicates that the element was recovered * resides in an IBF that was previously subtracted from. - * @param ret_key receives the hash code of the decoded element, if successful + * @param ret_id receives the hash code of the decoded element, if successful * @return GNUNET_YES if decoding an element was successful, * GNUNET_NO if the IBF is empty, * GNUNET_SYSERR if the decoding has failed diff --git a/src/consensus/ibf.h b/src/consensus/ibf.h index d6c3874aa..609653889 100644 --- a/src/consensus/ibf.h +++ b/src/consensus/ibf.h @@ -223,13 +223,13 @@ ibf_subtract (struct InvertibleBloomFilter *ibf1, const struct InvertibleBloomFi * @param ret_side sign of the cell's count where the decoded element came from. * A negative sign indicates that the element was recovered * resides in an IBF that was previously subtracted from. - * @param ret_key receives the hash code of the decoded element, if successful + * @param ret_id receives the hash code of the decoded element, if successful * @return GNUNET_YES if decoding an element was successful, * GNUNET_NO if the IBF is empty, * GNUNET_SYSERR if the decoding has failed */ int -ibf_decode (struct InvertibleBloomFilter *ibf, int *ret_side, struct IBF_Key *ret_key); +ibf_decode (struct InvertibleBloomFilter *ibf, int *ret_side, struct IBF_Key *ret_id); /** diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index 4cc247d19..9f2c9ea50 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h @@ -184,7 +184,9 @@ struct GNUNET_ARM_Handle; * @param error GNUNET_YES if we encountered a permanent error, and there * will be no re-connection. */ -typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, struct GNUNET_ARM_Handle *arm, char connected); +typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, + struct GNUNET_ARM_Handle *arm, + int connected); /** diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 6c51dacca..8886a344c 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -2142,8 +2142,6 @@ handle_test_blacklist_cont (void *cls, * @param address address of the other peer, NULL if other peer * connected to us * @param session session to use (or NULL) - * @param ats performance data - * @param ats_count number of entries in ats (excluding 0-termination) */ static void check_blacklist (const struct GNUNET_PeerIdentity *peer, @@ -2181,8 +2179,6 @@ check_blacklist (const struct GNUNET_PeerIdentity *peer, * @param address address of the other peer, NULL if other peer * connected to us * @param session session to use (or NULL) - * @param ats performance data - * @param ats_count number of entries in ats (excluding 0-termination) */ void GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, @@ -2745,8 +2741,6 @@ send_session_ack_message (struct NeighbourMapEntry *n) * @param address address of the other peer, NULL if other peer * connected to us * @param session session to use (or NULL) - * @param ats performance data - * @param ats_count number of entries in ats */ void GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index fbf7d7819..aae0a82b8 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h @@ -168,8 +168,6 @@ GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target); * * @param cls closure * @param neighbour identity of the neighbour - * @param ats performance data - * @param ats_count number of entries in ats (including 0-termination) * @param address the address (or NULL) * @param bandwidth_in inbound quota in NBO * @param bandwidth_out outbound quota in NBO diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 929963127..1c3b5e59c 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -515,8 +515,6 @@ transmit_data (void *cls, size_t size, void *buf) * * @param cls closure * @param peer the peer that connected - * @param ats performance data - * @param ats_count number of entries in ats (excluding 0-termination) */ static void notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) -- 2.25.1