From a8ab9fa836821cc6c4804cf44fcac5a91df25c45 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Sat, 24 Mar 2012 09:05:15 +0000 Subject: [PATCH] fixed compile error from r20729 --- src/include/gnunet_stream_lib.h | 10 +++++----- src/stream/stream_api.c | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/include/gnunet_stream_lib.h b/src/include/gnunet_stream_lib.h index 930cc1d3d..78b11d1c5 100644 --- a/src/include/gnunet_stream_lib.h +++ b/src/include/gnunet_stream_lib.h @@ -185,10 +185,10 @@ GNUNET_STREAM_listen (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Closes the listen socket * - * @param socket the listen socket + * @param lsocket the listen socket */ void -GNUNET_STREAM_listen_close (struct GNUNET_STREAM_ListenSocket *socket); +GNUNET_STREAM_listen_close (struct GNUNET_STREAM_ListenSocket *lsocket); /** @@ -243,7 +243,7 @@ GNUNET_STREAM_write (struct GNUNET_STREAM_Socket *socket, * @param cls the closure from GNUNET_STREAM_read * @param status the status of the stream at the time this function is called * @param data traffic from the other side - * @param size the number of bytes available in data read + * @param size the number of bytes available in data read; will be 0 on timeout * @return number of bytes of processed from 'data' (any data remaining should be * given to the next time the read processor is called). */ @@ -275,7 +275,7 @@ GNUNET_STREAM_read (struct GNUNET_STREAM_Socket *socket, * @param ioh handle to operation to cancel */ void -GNUNET_STREAM_io_write_cancel (struct GNUNET_STREAM_IOWriteHandle *ioh); +GNUNET_STREAM_io_write_cancel (struct GNUNET_STREAM_IOWriteHandle *iowh); /** @@ -284,7 +284,7 @@ GNUNET_STREAM_io_write_cancel (struct GNUNET_STREAM_IOWriteHandle *ioh); * @param ioh handle to operation to cancel */ void -GNUNET_STREAM_io_read_cancel (struct GNUNET_STREAM_IOReadHandle *ioh); +GNUNET_STREAM_io_read_cancel (struct GNUNET_STREAM_IOReadHandle *iorh); #if 0 diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c index 56dbdc478..f9895ae77 100644 --- a/src/stream/stream_api.c +++ b/src/stream/stream_api.c @@ -431,7 +431,7 @@ struct GNUNET_STREAM_IOReadHandle static unsigned int default_timeout = 10; /** - * Callback function for sending hello message + * Callback function for sending queued message * * @param cls closure the socket * @param size number of bytes available in buf @@ -777,7 +777,8 @@ write_data (struct GNUNET_STREAM_Socket *socket) packet = ack_packet + 1; /* Now send new packets if there is enough buffer space */ while ( (NULL != io_handle->messages[packet]) && - (socket->receiver_window_available >= ntohs (io_handle->messages[packet]->header.header.size)) ) + (socket->receiver_window_available + >= ntohs (io_handle->messages[packet]->header.header.size)) ) { socket->receiver_window_available -= ntohs (io_handle->messages[packet]->header.header.size); @@ -2480,10 +2481,10 @@ GNUNET_STREAM_listen (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Closes the listen socket * - * @param socket the listen socket + * @param lsocket the listen socket */ void -GNUNET_STREAM_listen_close (struct GNUNET_STREAM_ListenSocket *socket) +GNUNET_STREAM_listen_close (struct GNUNET_STREAM_ListenSocket *lsocket) { /* Close MESH connection */ GNUNET_assert (NULL != lsocket->mesh); -- 2.25.1