cvs: Zend(PHP_4_3) / zend_alloc.c zend_alloc.h

sniper Thu Apr 7 16:54:35 2005 EDT Modified files: (Branch: PHP_4_3) /Zend zend_alloc.c zend_alloc.h Log: MFH: Nuke duplicated code http://cvs.php.net/diff.php/Zend/zend_alloc.c?r1=1.105.4.8&r2=1.105.4.9&ty=u Index: Zend/zend_alloc.c diff -u Zend/zend_alloc.c:1.105.4.8 Zend/zend_alloc.c:1.105.4.9 --- Zend/zend_alloc.c:1.105.4.8 Thu Apr 7 10:43:37 2005 +++ Zend/zend_alloc.c Thu Apr 7 16:54:33 2005 @@ -372,16 +372,6 @@ return p; } -#if !USE_ZEND_ALLOC -char *_strndup(char *s, uint l) -{ - char *tmp = malloc(l+1); - tmp[l] = '\0'; - memcpy(tmp, s, l); - return tmp; -} -#endif - ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { char *p; http://cvs.php.net/diff.php/Zend/zend_alloc.h?r1=1.39.4.9&r2=1.39.4.10&ty=u Index: Zend/zend_alloc.h diff -u Zend/zend_alloc.h:1.39.4.9 Zend/zend_alloc.h:1.39.4.10 --- Zend/zend_alloc.h:1.39.4.9 Thu Apr 7 10:44:31 2005 +++ Zend/zend_alloc.h Thu Apr 7 16:54:33 2005 @@ -112,16 +112,11 @@ #define perealloc_recoverable(ptr, size, persistent) ((persistent)?realloc((ptr), (size)):erealloc_recoverable((ptr), (size))) #define pestrdup(s, persistent) ((persistent)?strdup(s):estrdup(s)) -#define safe_estrdup(ptr) ((ptr)?(estrdup(ptr)):(empty_string)) -#define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):(empty_string)) - #else #define _GNU_SOURCE #include <string.h> #undef _GNU_SOURCE - -char *_strndup(char *s, uint l); /* Standard wrapper macros */ #define emalloc(size) malloc(size) @@ -131,7 +126,7 @@ #define erealloc(ptr, size) realloc((ptr), (size)) #define erealloc_recoverable(ptr, size) realloc((ptr), (size)) #define estrdup(s) strdup(s) -#define estrndup(s, length) _strndup((s), (length)) +#define estrndup(s, length) zend_strndup((s), (length)) /* Relay wrapper macros */ #define emalloc_rel(size) malloc(size) @@ -141,7 +136,7 @@ #define erealloc_rel(ptr, size) realloc((ptr), (size)) #define erealloc_recoverable_rel(ptr, size) realloc((ptr), (size)) #define estrdup_rel(s) strdup(s) -#define estrndup_rel(s, length) _strndup((s), (length)) +#define estrndup_rel(s, length) zend_strndup((s), (length)) /* Selective persistent/non persistent allocation macros */ #define pemalloc(size, persistent) malloc(size) @@ -150,11 +145,10 @@ #define perealloc(ptr, size, persistent) realloc((ptr), (size)) #define perealloc_recoverable(ptr, size, persistent) realloc((ptr), (size)) #define pestrdup(s, persistent) strdup(s) +#endif /* !USE_ZEND_ALLOC */ -#define safe_estrdup(ptr) ((ptr)?(strdup(ptr)):(empty_string)) -#define safe_estrndup(ptr, len) ((ptr)?(_strndup((ptr), (len))):(empty_string)) - -#endif +#define safe_estrdup(ptr) ((ptr)?(estrdup(ptr)):(empty_string)) +#define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):(empty_string)) ZEND_API int zend_set_memory_limit(unsigned int memory_limit);