From e35b560e5a35ea173a9162f221a1350913002e7a Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 14:31:33 +0100 Subject: [PATCH] Moved is_file_opened to own file --- Makefile | 1 + src/httplib_is_file_opened.c | 37 ++++++++++++++++++++++++++++++++++++ src/libhttp.c | 8 -------- 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 src/httplib_is_file_opened.c diff --git a/Makefile b/Makefile index 3f34b9fe..3ad45ac1 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_interpret_uri.c \ src/httplib_is_authorized_for_put.c \ src/httplib_is_file_in_memory.c \ + src/httplib_is_file_opened.c \ src/httplib_is_not_modified.c \ src/httplib_is_put_or_delete_method.c \ src/httplib_is_valid_http_method.c \ diff --git a/src/httplib_is_file_opened.c b/src/httplib_is_file_opened.c new file mode 100644 index 00000000..d30c1195 --- /dev/null +++ b/src/httplib_is_file_opened.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" + + + +bool XX_httplib_is_file_opened( const struct file *filep ) { + + if ( filep == NULL ) return false; + + return ( filep->membuf != NULL || filep->fp != NULL ); + +} /* XX_httplib_is_file_opened */ diff --git a/src/libhttp.c b/src/libhttp.c index 1b2d56c4..6a3d7549 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -827,14 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) { #endif -bool XX_httplib_is_file_opened( const struct file *filep ) { - - if ( filep == NULL ) return false; - - return ( filep->membuf != NULL || filep->fp != NULL ); - -} /* XX_httplib_is_file_opened */ - /* XX_httplib_fopen will open a file either in memory or on the disk. * The input parameter path is a string in UTF-8 encoding.