From 580c07328f2fcc0ac1f1b027bc5a62cc620a941e Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 01:45:56 +0100
Subject: [PATCH] Moved realloc2 to own file

---
 Makefile               |  1 +
 src/httplib_realloc2.c | 38 ++++++++++++++++++++++++++++++++++++++
 src/libhttp.c          | 12 ------------
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/httplib_realloc2.c

diff --git a/Makefile b/Makefile
index cac93e55..60dc2254 100644
--- a/Makefile
+++ b/Makefile
@@ -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				\
diff --git a/src/httplib_realloc2.c b/src/httplib_realloc2.c
new file mode 100644
index 00000000..794f7752
--- /dev/null
+++ b/src/httplib_realloc2.c
@@ -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 */
diff --git a/src/libhttp.c b/src/libhttp.c
index 1bd09f79..38cddab4 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -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 */