From ef6db6db449307b96ec9eade1df13c14ad5d54ce Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 15:07:00 +0100 Subject: [PATCH] Moved set_user_connection_data to own file --- Makefile | 1 + src/httplib_set_user_connection_data.c | 34 ++++++++++++++++++++++++++ src/libhttp.c | 7 ------ 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 src/httplib_set_user_connection_data.c diff --git a/Makefile b/Makefile index f592254f..e0e6f086 100644 --- a/Makefile +++ b/Makefile @@ -174,6 +174,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_set_tcp_nodelay.c \ src/httplib_set_throttle.c \ src/httplib_set_uid_option.c \ + src/httplib_set_user_connection_data.c \ src/httplib_set_websocket_handler.c \ src/httplib_snprintf.c \ src/httplib_spawn_process.c \ diff --git a/src/httplib_set_user_connection_data.c b/src/httplib_set_user_connection_data.c new file mode 100644 index 00000000..a7674bb8 --- /dev/null +++ b/src/httplib_set_user_connection_data.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016 Lammert Bies + * Copyright (c) 2013-2016 the Civetweb developers + * Copyright (c) 2004-2013 Sergey Lyubka + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + + + +#include "libhttp-private.h" + + +void mg_set_user_connection_data(struct mg_connection *conn, void *data) { + + if (conn != NULL) conn->request_info.conn_data = data; + +} /* mt_set_user_connection_data */ diff --git a/src/libhttp.c b/src/libhttp.c index 1daa685c..66661518 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -828,13 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) { -void mg_set_user_connection_data(struct mg_connection *conn, void *data) { - - if (conn != NULL) conn->request_info.conn_data = data; - -} /* mt_set_user_connection_data */ - - void * mg_get_user_connection_data(const struct mg_connection *conn) { if (conn != NULL) return conn->request_info.conn_data;