summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-08-02 09:08:51 +0000
committerng0 <ng0@n0.is>2019-08-02 09:08:51 +0000
commitb98ad354ca1ec1d88e2cc1da5a67e7da11b9f6c4 (patch)
tree3345a4272deb70a55f99a14e36d4525192965e8d
parent7d7d55d12d92face09336f44380a91477a322fa4 (diff)
Rename senfile_adapter to MHD_send_sendfile_ and remove duplicate prototype.
-rw-r--r--src/microhttpd/connection.c2
-rw-r--r--src/microhttpd/mhd_send.c3
-rw-r--r--src/microhttpd/mhd_send.h5
3 files changed, 3 insertions, 7 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index cee38b8d..070fad51 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3123,7 +3123,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
#if defined(_MHD_HAVE_SENDFILE)
if (MHD_resp_sender_sendfile == connection->resp_sender)
{
- ret = sendfile_adapter (connection);
+ ret = MHD_send_sendfile_ (connection);
}
else
#else /* ! _MHD_HAVE_SENDFILE */
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 11ed6db7..0b1ae127 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -435,9 +435,8 @@ static int freebsd_sendfile_flags_thd_p_c_;
* @param connection the MHD connection structure
* @return actual number of bytes sent
*/
-// FIXME: rename...
ssize_t
-sendfile_adapter (struct MHD_Connection *connection)
+MHD_send_sendfile_ (struct MHD_Connection *connection)
{
ssize_t ret;
const int file_fd = connection->response->fd;
diff --git a/src/microhttpd/mhd_send.h b/src/microhttpd/mhd_send.h
index 5f0f8155..a766c8c0 100644
--- a/src/microhttpd/mhd_send.h
+++ b/src/microhttpd/mhd_send.h
@@ -89,12 +89,9 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection,
const char *buffer,
size_t buffer_size);
-ssize_t
-MHD_sendfile_on_connection_ (struct MHD_Connection *connection);
-
#if defined(_MHD_HAVE_SENDFILE)
ssize_t
-sendfile_adapter (struct MHD_Connection *connection);
+MHD_send_sendfile_ (struct MHD_Connection *connection);
#endif
#endif /* MHD_SEND_H */