diff --git a/Makefile b/Makefile index fc9b3714..93ba120f 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ LIB_SOURCES = src/libhttp.c \ src/httplib_construct_etag.c \ src/httplib_consume_socket.c \ src/httplib_delete_file.c \ + src/httplib_difftimespec.c \ src/httplib_dir_scan_callback.c \ src/httplib_discard_unread_request_data.c \ src/httplib_download.c \ diff --git a/src/httplib_difftimespec.c b/src/httplib_difftimespec.c new file mode 100644 index 00000000..c263232c --- /dev/null +++ b/src/httplib_difftimespec.c @@ -0,0 +1,36 @@ +/* + * 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" + + +/* difftime for struct timespec. Return value is in seconds. */ +double XX_httplib_difftimespec(const struct timespec *ts_now, const struct timespec *ts_before) { + + return (double)(ts_now->tv_nsec - ts_before->tv_nsec) * 1.0E-9 + + (double)(ts_now->tv_sec - ts_before->tv_sec); + +} /* XX_httplib_difftimespec */ diff --git a/src/libhttp.c b/src/libhttp.c index c8b558ba..31907d1d 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -827,14 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) { #endif -/* difftime for struct timespec. Return value is in seconds. */ -double XX_httplib_difftimespec(const struct timespec *ts_now, const struct timespec *ts_before) { - - return (double)(ts_now->tv_nsec - ts_before->tv_nsec) * 1.0E-9 - + (double)(ts_now->tv_sec - ts_before->tv_sec); - -} /* XX_httplib_difftimespec */ - /* Print error message to the opened error log stream. */ void mg_cry(const struct mg_connection *conn, const char *fmt, ...) {