From: Derick Rethans <derick@php.net>
Date: Mon, 18 Nov 2002 13:00:52 +0000 (+0000)
Subject: - Remove e*() memory function calls from the branch
X-Git-Tag: php-4.3.0RC2~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b6f7554c06090eba04d77282d35dbc57c567f86;p=php

- Remove e*() memory function calls from the branch
---

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 022604b6ad..bc39f09c76 100644
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -347,7 +347,7 @@ fontFetch (char **error, void *key)
   FT_CharMap charmap;
 
   a = (font_t *) gdMalloc (sizeof (font_t));
-  a->fontlist = gdEstrdup (b->fontlist);
+  a->fontlist = strdup (b->fontlist);
   a->library = b->library;
 
   /*
@@ -356,7 +356,7 @@ fontFetch (char **error, void *key)
   fontsearchpath = getenv ("GDFONTPATH");
   if (!fontsearchpath)
     fontsearchpath = DEFAULT_FONTPATH;
-  fontlist = gdEstrdup (a->fontlist);
+  fontlist = strdup (a->fontlist);
 
   /*
    * Must use gd_strtok_r else pointer corrupted by strtok in nested loop.
@@ -366,7 +366,7 @@ fontFetch (char **error, void *key)
     {
 
       /* make a fresh copy each time - strtok corrupts it. */
-      path = gdEstrdup (fontsearchpath);
+      path = strdup (fontsearchpath);
       /*
        * Allocate an oversized buffer that is guaranteed to be
        * big enough for all paths to be tested.
diff --git a/ext/gd/libgd/gdhelpers.c b/ext/gd/libgd/gdhelpers.c
index 32620e8551..8fdd8c08ab 100644
--- a/ext/gd/libgd/gdhelpers.c
+++ b/ext/gd/libgd/gdhelpers.c
@@ -80,29 +80,23 @@ gd_strtok_r (char *s, char *sep, char **state)
 void *
 gdCalloc (size_t nmemb, size_t size)
 {
-  return ecalloc (nmemb, size);
+  return calloc (nmemb, size);
 }
 
 void *
 gdMalloc (size_t size)
 {
-  return emalloc (size);
+  return malloc (size);
 }
 
 void *
 gdRealloc (void *ptr, size_t size)
 {
-  return erealloc (ptr, size);
+  return realloc (ptr, size);
 }
 
 void
 gdFree (void *ptr)
 {
-  efree (ptr);
-}
-
-char *
-gdEstrdup (const char *ptr)
-{
-  return estrdup(ptr);
+  free (ptr);
 }