1
0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00

Moved realloc2 to own file

This commit is contained in:
Lammert Bies
2016-12-11 01:45:56 +01:00
parent 345c574335
commit 580c07328f
3 changed files with 39 additions and 12 deletions

View File

@@ -98,6 +98,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_put_file.c \
src/httplib_read_request.c \
src/httplib_read_websocket.c \
src/httplib_realloc2.c \
src/httplib_redirect_to_https_port.c \
src/httplib_refresh_trust.c \
src/httplib_remove_bad_file.c \

38
src/httplib_realloc2.c Normal file
View File

@@ -0,0 +1,38 @@
/*
* 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"
/* Behaves like realloc(), but frees original pointer on failure */
void *XX_httplib_realloc2( void *ptr, size_t size ) {
void *new_ptr = XX_httplib_realloc(ptr, size);
if (new_ptr == NULL) XX_httplib_free(ptr);
return new_ptr;
} /* XX_httplib_realloc2 */

View File

@@ -4671,15 +4671,3 @@ int XX_httplib_remove_directory( struct mg_connection *conn, const char *dir ) {
} /* XX_httplib_remove_directory */
#endif
/* Behaves like realloc(), but frees original pointer on failure */
void *XX_httplib_realloc2( void *ptr, size_t size ) {
void *new_ptr = XX_httplib_realloc(ptr, size);
if (new_ptr == NULL) XX_httplib_free(ptr);
return new_ptr;
} /* XX_httplib_realloc2 */