From 33aba09e6a5fcd550d8dc5e973154597b0ee93e5 Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 15:30:07 +0100 Subject: [PATCH] Moved httplib_skip to own file --- Makefile | 1 + src/httplib_skip.c | 37 +++++++++++++++++++++++++++++++++++++ src/libhttp.c | 9 --------- 3 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 src/httplib_skip.c diff --git a/Makefile b/Makefile index 50906f5b..9b2e1801 100644 --- a/Makefile +++ b/Makefile @@ -183,6 +183,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_set_uid_option.c \ src/httplib_set_user_connection_data.c \ src/httplib_set_websocket_handler.c \ + src/httplib_skip.c \ src/httplib_skip_quoted.c \ src/httplib_snprintf.c \ src/httplib_sockaddr_to_string.c \ diff --git a/src/httplib_skip.c b/src/httplib_skip.c new file mode 100644 index 00000000..8025d352 --- /dev/null +++ b/src/httplib_skip.c @@ -0,0 +1,37 @@ +/* + * 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" + + + +/* Simplified version of XX_httplib_skip_quoted without quote char + * and whitespace == delimiters */ +char *XX_httplib_skip( char **buf, const char *delimiters ) { + + return XX_httplib_skip_quoted( buf, delimiters, delimiters, 0 ); + +} /* XX_httplib_skip */ diff --git a/src/libhttp.c b/src/libhttp.c index 15455f4b..91646a71 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -828,15 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) { -/* Simplified version of XX_httplib_skip_quoted without quote char - * and whitespace == delimiters */ -char *XX_httplib_skip( char **buf, const char *delimiters ) { - - return XX_httplib_skip_quoted( buf, delimiters, delimiters, 0 ); - -} /* XX_httplib_skip */ - - /* Return HTTP header value, or NULL if not found. */ const char * XX_httplib_get_header( const struct mg_request_info *ri, const char *name ) {