diff --git a/Makefile b/Makefile index cf14f5c4..77f3ce12 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_parse_range_header.c \ src/httplib_prepare_cgi_environment.c \ src/httplib_print_dir_entry.c \ + src/httplib_printf.c \ src/httplib_process_new_connection.c \ src/httplib_produce_socket.c \ src/httplib_put_dir.c \ diff --git a/src/httplib_printf.c b/src/httplib_printf.c new file mode 100644 index 00000000..cd637c3a --- /dev/null +++ b/src/httplib_printf.c @@ -0,0 +1,42 @@ +/* + * 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" + + + +int mg_printf( struct mg_connection *conn, const char *fmt, ... ) { + + va_list ap; + int result; + + va_start(ap, fmt); + result = XX_httplib_vprintf(conn, fmt, ap); + va_end(ap); + + return result; + +} /* mg_printf */ diff --git a/src/libhttp.c b/src/libhttp.c index 193b65c0..82322b2f 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -3167,17 +3167,3 @@ int XX_httplib_vprintf( struct mg_connection *conn, const char *fmt, va_list ap return len; } /* XX_httplib_vprintf */ - - -int mg_printf( struct mg_connection *conn, const char *fmt, ... ) { - - va_list ap; - int result; - - va_start(ap, fmt); - result = XX_httplib_vprintf(conn, fmt, ap); - va_end(ap); - - return result; - -} /* mg_printf */