derick Mon Nov 18 08:00:53 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gdft.c gdhelpers.c
Log:
- Remove e*() memory function calls from the branch
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.11.2.2 php4/ext/gd/libgd/gdft.c:1.11.2.3
--- php4/ext/gd/libgd/gdft.c:1.11.2.2 Sun Nov 17 14:40:38 2002
+++ php4/ext/gd/libgd/gdft.c Mon Nov 18 08:00:52 2002
@@ -347,7 +347,7 @@
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 @@
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 @@
{
/* 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.
Index: php4/ext/gd/libgd/gdhelpers.c
diff -u php4/ext/gd/libgd/gdhelpers.c:1.3.2.1 php4/ext/gd/libgd/gdhelpers.c:1.3.2.2
--- php4/ext/gd/libgd/gdhelpers.c:1.3.2.1 Sun Nov 17 14:40:38 2002
+++ php4/ext/gd/libgd/gdhelpers.c Mon Nov 18 08:00:52 2002
@@ -80,29 +80,23 @@
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
