Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / strdup.c

diff --git a/lib/strdup.c b/lib/strdup.c
index a997b12..3b776b1 100644 (file)
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -19,12 +19,12 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
+/*
+ * This file is 'mem-include-scan' clean. See test 1132.
+ */
 #include "curl_setup.h"
-#include "strdup.h"
-#include "curl_memory.h"
 
-/* The last #include file should be: */
-#include "memdebug.h"
+#include "strdup.h"
 
 #ifndef HAVE_STRDUP
 char *curlx_strdup(const char *str)
@@ -50,24 +50,3 @@ char *curlx_strdup(const char *str)
 
 }
 #endif
-
-/***************************************************************************
- *
- * Curl_memdup(source, length)
- *
- * Copies the 'source' data to a newly allocated buffer (that is
- * returned). Copies 'length' bytes.
- *
- * Returns the new pointer or NULL on failure.
- *
- ***************************************************************************/
-char *Curl_memdup(const char *src, size_t length)
-{
-  char *buffer = malloc(length);
-  if(!buffer)
-    return NULL; /* fail */
-
-  memcpy(buffer, src, length);
-
-  return buffer;
-}