libmicrohttpd

HTTP/1.x server C library (MHD 1.x, stable)
Log | Files | Refs | Submodules | README | LICENSE

commit e25c43fcc0be9c183b2d7f04316c9dadface2778
parent 9cc7bd0c77b57d545ef560e0b7b637196b20914f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 24 Dec 2013 11:32:11 +0000

-hiding a few more

Diffstat:
Msrc/microhttpd/connection.c | 2+-
Msrc/microhttpd/connection.h | 12++++++------
Msrc/microhttpd/memorypool.c | 6+++++-
Msrc/microhttpd/memorypool.h | 10+++++++---
Msrc/microhttpd/response.c | 16++++++++--------
Msrc/microhttpd/response.h | 3++-
6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c @@ -257,7 +257,7 @@ need_100_continue (struct MHD_Connection *connection) * @param connection connection to close * @param termination_code termination reason to give */ -void +void HIDDEN_SYMBOL MHD_connection_close (struct MHD_Connection *connection, enum MHD_RequestTerminationCode termination_code) { diff --git a/src/microhttpd/connection.h b/src/microhttpd/connection.h @@ -35,7 +35,7 @@ * * @param connection connection to initialize */ -void +void MHD_set_http_callbacks_ (struct MHD_Connection *connection); @@ -49,7 +49,7 @@ MHD_set_http_callbacks_ (struct MHD_Connection *connection); * @return always MHD_YES (we should continue to process the * connection) */ -int +int MHD_connection_handle_read (struct MHD_Connection *connection); @@ -63,7 +63,7 @@ MHD_connection_handle_read (struct MHD_Connection *connection); * @return always MHD_YES (we should continue to process the * connection) */ -int +int MHD_connection_handle_write (struct MHD_Connection *connection); @@ -77,7 +77,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection); * @return MHD_YES if we should continue to process the * connection (not dead yet), MHD_NO if it died */ -int +int MHD_connection_handle_idle (struct MHD_Connection *connection); @@ -88,7 +88,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection); * @param connection connection to close * @param termination_code termination reason to give */ -void +void HIDDEN_SYMBOL MHD_connection_close (struct MHD_Connection *connection, enum MHD_RequestTerminationCode termination_code); @@ -101,7 +101,7 @@ MHD_connection_close (struct MHD_Connection *connection, * @param connection connection to process * @return MHD_YES if we should continue to process the * connection (not dead yet), MHD_NO if it died - */ + */ int MHD_connection_epoll_update_ (struct MHD_Connection *connection); #endif diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c @@ -83,6 +83,7 @@ struct MemoryPool * @param max maximum size of the pool * @return NULL on error */ +HIDDEN_SYMBOL struct MemoryPool * MHD_pool_create (size_t max) { @@ -126,7 +127,7 @@ MHD_pool_create (size_t max) * * @param pool memory pool to destroy */ -void +void HIDDEN_SYMBOL MHD_pool_destroy (struct MemoryPool *pool) { if (pool == NULL) @@ -150,6 +151,7 @@ MHD_pool_destroy (struct MemoryPool *pool) * @return NULL if the pool cannot support size more * bytes */ +HIDDEN_SYMBOL void * MHD_pool_allocate (struct MemoryPool *pool, size_t size, int from_end) @@ -193,6 +195,7 @@ MHD_pool_allocate (struct MemoryPool *pool, * NULL if the pool cannot support @a new_size * bytes (old continues to be valid for @a old_size) */ +HIDDEN_SYMBOL void * MHD_pool_reallocate (struct MemoryPool *pool, void *old, @@ -247,6 +250,7 @@ MHD_pool_reallocate (struct MemoryPool *pool, * @param size how many bytes need to be kept at this address * @return addr new address of @a keep (if it had to change) */ +HIDDEN_SYMBOL void * MHD_pool_reset (struct MemoryPool *pool, void *keep, diff --git a/src/microhttpd/memorypool.h b/src/microhttpd/memorypool.h @@ -44,6 +44,7 @@ struct MemoryPool; * @param max maximum size of the pool * @return NULL on error */ +HIDDEN_SYMBOL struct MemoryPool * MHD_pool_create (size_t max); @@ -53,7 +54,7 @@ MHD_pool_create (size_t max); * * @param pool memory pool to destroy */ -void +void HIDDEN_SYMBOL MHD_pool_destroy (struct MemoryPool *pool); @@ -68,6 +69,7 @@ MHD_pool_destroy (struct MemoryPool *pool); * @return NULL if the pool cannot support size more * bytes */ +HIDDEN_SYMBOL void * MHD_pool_allocate (struct MemoryPool *pool, size_t size, int from_end); @@ -90,10 +92,11 @@ MHD_pool_allocate (struct MemoryPool *pool, * NULL if the pool cannot support new_size * bytes (old continues to be valid for old_size) */ +HIDDEN_SYMBOL void * MHD_pool_reallocate (struct MemoryPool *pool, void *old, - size_t old_size, + size_t old_size, size_t new_size); @@ -106,9 +109,10 @@ MHD_pool_reallocate (struct MemoryPool *pool, * @param size how many bytes need to be kept at this address * @return addr new address of "keep" (if it had to change) */ +HIDDEN_SYMBOL void * MHD_pool_reset (struct MemoryPool *pool, - void *keep, + void *keep, size_t size); #endif diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c @@ -40,7 +40,7 @@ static int add_response_entry (struct MHD_Response *response, enum MHD_ValueKind kind, - const char *header, + const char *header, const char *content) { struct MHD_HTTP_Header *hdr; @@ -54,7 +54,7 @@ add_response_entry (struct MHD_Response *response, (NULL != strchr (header, '\r')) || (NULL != strchr (header, '\n')) || (NULL != strchr (content, '\t')) || - (NULL != strchr (content, '\r')) || + (NULL != strchr (content, '\r')) || (NULL != strchr (content, '\n')) ) return MHD_NO; if (NULL == (hdr = malloc (sizeof (struct MHD_HTTP_Header)))) @@ -197,7 +197,7 @@ MHD_get_response_headers (struct MHD_Response *response, * @ingroup response */ const char * -MHD_get_response_header (struct MHD_Response *response, +MHD_get_response_header (struct MHD_Response *response, const char *key) { struct MHD_HTTP_Header *pos; @@ -261,7 +261,7 @@ MHD_create_response_from_callback (uint64_t size, /** * Given a file descriptor, read data from the file * to generate the response. - * + * * @param cls pointer to the response * @param pos offset in the file to access * @param buf where to write the data @@ -276,9 +276,9 @@ file_reader (void *cls, uint64_t pos, char *buf, size_t max) (void) lseek (response->fd, pos + response->fd_off, SEEK_SET); n = read (response->fd, buf, max); - if (0 == n) + if (0 == n) return MHD_CONTENT_READER_END_OF_STREAM; - if (n < 0) + if (n < 0) return MHD_CONTENT_READER_END_WITH_ERROR; return n; } @@ -309,7 +309,7 @@ free_callback (void *cls) * data; will be closed when response is destroyed; * fd should be in 'blocking' mode * @param offset offset to start reading from in the file; - * Be careful! `off_t` may have been compiled to be a + * Be careful! `off_t` may have been compiled to be a * 64-bit variable for MHD, in which case your application * also has to be compiled using the same options! Read * the MHD manual for more details. @@ -469,7 +469,7 @@ MHD_destroy_response (struct MHD_Response *response) } -void +void HIDDEN_SYMBOL MHD_increment_response_rc (struct MHD_Response *response) { pthread_mutex_lock (&response->mutex); diff --git a/src/microhttpd/response.h b/src/microhttpd/response.h @@ -31,7 +31,8 @@ * Increment response RC. Should this be part of the * public API? */ -void MHD_increment_response_rc (struct MHD_Response *response); +void HIDDEN_SYMBOL +MHD_increment_response_rc (struct MHD_Response *response); #endif