From c937a1623b7fde5ff51c0055c0b3b65921a1f67d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 8 Dec 2013 23:32:08 +0000 Subject: [PATCH] -cleanup --- src/include/gnunet_server_lib.h | 39 ++++++++++++++------------------- src/util/server_mst.c | 13 ++++++----- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h index e29be0d56..8fa5a8718 100644 --- a/src/include/gnunet_server_lib.h +++ b/src/include/gnunet_server_lib.h @@ -96,7 +96,7 @@ struct GNUNET_SERVER_MessageHandler GNUNET_SERVER_MessageCallback callback; /** - * Closure argument for "callback". + * Closure argument for @e callback. */ void *callback_cls; @@ -210,8 +210,7 @@ GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server); */ void GNUNET_SERVER_add_handlers (struct GNUNET_SERVER_Handle *server, - const struct GNUNET_SERVER_MessageHandler - *handlers); + const struct GNUNET_SERVER_MessageHandler *handlers); /** @@ -233,8 +232,8 @@ struct GNUNET_SERVER_TransmitHandle * GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, size_t size, struct GNUNET_TIME_Relative timeout, - GNUNET_CONNECTION_TransmitReadyNotify - callback, void *callback_cls); + GNUNET_CONNECTION_TransmitReadyNotify callback, + void *callback_cls); /** @@ -513,8 +512,8 @@ GNUNET_SERVER_connect_notify (struct GNUNET_SERVER_Handle *server, */ void GNUNET_SERVER_disconnect_notify_cancel (struct GNUNET_SERVER_Handle *server, - GNUNET_SERVER_DisconnectCallback - callback, void *callback_cls); + GNUNET_SERVER_DisconnectCallback callback, + void *callback_cls); /** @@ -587,8 +586,8 @@ GNUNET_SERVER_transmit_context_create (struct GNUNET_SERVER_Client *client); * @param type type of the message */ void -GNUNET_SERVER_transmit_context_append_data (struct GNUNET_SERVER_TransmitContext - *tc, const void *data, +GNUNET_SERVER_transmit_context_append_data (struct GNUNET_SERVER_TransmitContext *tc, + const void *data, size_t length, uint16_t type); @@ -601,11 +600,8 @@ GNUNET_SERVER_transmit_context_append_data (struct GNUNET_SERVER_TransmitContext * @param msg message to append */ void -GNUNET_SERVER_transmit_context_append_message (struct - GNUNET_SERVER_TransmitContext - *tc, - const struct GNUNET_MessageHeader - *msg); +GNUNET_SERVER_transmit_context_append_message (struct GNUNET_SERVER_TransmitContext *tc, + const struct GNUNET_MessageHeader *msg); /** @@ -634,8 +630,8 @@ GNUNET_SERVER_transmit_context_run (struct GNUNET_SERVER_TransmitContext *tc, * serious error) */ void -GNUNET_SERVER_transmit_context_destroy (struct GNUNET_SERVER_TransmitContext - *tc, int success); +GNUNET_SERVER_transmit_context_destroy (struct GNUNET_SERVER_TransmitContext *tc, + int success); /** @@ -731,9 +727,7 @@ struct GNUNET_SERVER_MessageStreamTokenizer; * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing */ typedef int (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, void *client, - const struct - GNUNET_MessageHeader * - message); + const struct GNUNET_MessageHeader *message); /** @@ -766,7 +760,8 @@ GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, */ int GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst, - void *client_identity, const char *buf, size_t size, + void *client_identity, + const char *buf, size_t size, int purge, int one_shot); @@ -782,7 +777,7 @@ GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst); /** * Signature of a function to create a custom tokenizer. * - * @param cls closure from 'GNUNET_SERVER_set_callbacks' + * @param cls closure from #GNUNET_SERVER_set_callbacks * @param client handle to client the tokenzier will be used for * @return handle to custom tokenizer ('mst') */ @@ -793,7 +788,7 @@ typedef void* (*GNUNET_SERVER_MstCreateCallback) (void *cls, /** * Signature of a function to destroy a custom tokenizer. * - * @param cls closure from 'GNUNET_SERVER_set_callbacks' + * @param cls closure from #GNUNET_SERVER_set_callbacks * @param mst custom tokenizer handle */ typedef void (*GNUNET_SERVER_MstDestroyCallback) (void *cls, void *mst); diff --git a/src/util/server_mst.c b/src/util/server_mst.c index 4e96653dc..6ef432756 100644 --- a/src/util/server_mst.c +++ b/src/util/server_mst.c @@ -81,7 +81,7 @@ struct GNUNET_SERVER_MessageStreamTokenizer * Create a message stream tokenizer. * * @param cb function to call on completed messages - * @param cb_cls closure for cb + * @param cb_cls closure for @a cb * @return handle to tokenizer */ struct GNUNET_SERVER_MessageStreamTokenizer * @@ -106,17 +106,18 @@ GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, * @param mst tokenizer to use * @param client_identity ID of client for which this is a buffer * @param buf input data to add - * @param size number of bytes in buf + * @param size number of bytes in @a buf * @param purge should any excess bytes in the buffer be discarded * (i.e. for packet-based services like UDP) * @param one_shot only call callback once, keep rest of message in buffer - * @return GNUNET_OK if we are done processing (need more data) - * GNUNET_NO if one_shot was set and we have another message ready - * GNUNET_SYSERR if the data stream is corrupt + * @return #GNUNET_OK if we are done processing (need more data) + * #GNUNET_NO if @a one_shot was set and we have another message ready + * #GNUNET_SYSERR if the data stream is corrupt */ int GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst, - void *client_identity, const char *buf, size_t size, + void *client_identity, + const char *buf, size_t size, int purge, int one_shot) { const struct GNUNET_MessageHeader *hdr; -- 2.25.1