felipe Thu, 15 Jul 2010 17:57:22 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=301296
Log: - Lets use the _emalloc, _efree functions Changed paths: U php/php-src/branches/LEMON/Zend/zend_compile.c U php/php-src/branches/LEMON/Zend/zend_compile.h U php/php-src/branches/LEMON/Zend/zend_ini_parser.y U php/php-src/branches/LEMON/lempar.c Modified: php/php-src/branches/LEMON/Zend/zend_compile.c =================================================================== --- php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-15 17:48:38 UTC (rev 301295) +++ php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-15 17:57:22 UTC (rev 301296) @@ -6114,8 +6114,8 @@ int token, lineno = 0, halting = 0, old_exit_status; void *pParser; - if ((pParser = zend_lang_parseAlloc(malloc)) == NULL) { - zend_lang_parseFree(pParser, free); + if ((pParser = zend_lang_parseAlloc(_emalloc)) == NULL) { + zend_lang_parseFree(pParser, _efree); return 1; } @@ -6177,7 +6177,7 @@ break; } } - zend_lang_parseFree(pParser, free); + zend_lang_parseFree(pParser, _efree); if (EG(exit_status) == 255) { /* We got an E_PARSE */ Modified: php/php-src/branches/LEMON/Zend/zend_compile.h =================================================================== --- php/php-src/branches/LEMON/Zend/zend_compile.h 2010-07-15 17:48:38 UTC (rev 301295) +++ php/php-src/branches/LEMON/Zend/zend_compile.h 2010-07-15 17:57:22 UTC (rev 301296) @@ -664,8 +664,8 @@ /* Parser */ int zendparse(TSRMLS_D); -void *zend_lang_parseAlloc(void *(*mallocProc)(size_t)); -void zend_lang_parseFree(void *p, void (*freeProc)(void*)); +void *zend_lang_parseAlloc(void *(*mallocProc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)); +void zend_lang_parseFree(void *p, void (*freeProc)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)); void zend_lang_parse(void *yyp, int yymajor, znode yyminor TSRMLS_DC); int zend_add_literal(zend_op_array *op_array, const zval *zv); Modified: php/php-src/branches/LEMON/Zend/zend_ini_parser.y =================================================================== --- php/php-src/branches/LEMON/Zend/zend_ini_parser.y 2010-07-15 17:48:38 UTC (rev 301295) +++ php/php-src/branches/LEMON/Zend/zend_ini_parser.y 2010-07-15 17:57:22 UTC (rev 301296) @@ -39,8 +39,8 @@ #define ZEND_INI_PARSER_SE (CG(ini_parser_param))->syntax_error int ini_parse(TSRMLS_D); -void *zend_ini_parseAlloc(void *(*mallocProc)(size_t)); -void zend_ini_parseFree(void *p, void (*freeProc)(void*)); +void *zend_ini_parseAlloc(void *(*mallocProc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)); +void zend_ini_parseFree(void *p, void (*freeProc)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)); void zend_ini_parse(void *yyp, int yymajor, zval yyminor TSRMLS_DC); /* {{{ zend_ini_do_op() @@ -219,10 +219,10 @@ int ini_parse(TSRMLS_D) /* {{{ */ { int token; - void *pParser = zend_ini_parseAlloc(malloc); + void *pParser = zend_ini_parseAlloc(_emalloc); if (pParser == NULL) { - zend_ini_parseFree(pParser, free); + zend_ini_parseFree(pParser, _efree); return 1; } @@ -236,7 +236,7 @@ } } - zend_ini_parseFree(pParser, free); + zend_ini_parseFree(pParser, _efree); if (ZEND_INI_PARSER_SE) { return 1; } else { Modified: php/php-src/branches/LEMON/lempar.c =================================================================== --- php/php-src/branches/LEMON/lempar.c 2010-07-15 17:48:38 UTC (rev 301295) +++ php/php-src/branches/LEMON/lempar.c 2010-07-15 17:57:22 UTC (rev 301296) @@ -266,9 +266,9 @@ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -void *ParseAlloc(void *(*mallocProc)(size_t)){ +void *ParseAlloc(void *(*mallocProc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)){ yyParser *pParser; - pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); + pParser = (yyParser*)(*mallocProc)( ((size_t)sizeof(yyParser)) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); if( pParser ){ pParser->yyidx = -1; #ifdef YYTRACKMAXSTACKDEPTH @@ -351,7 +351,7 @@ */ void ParseFree( void *p, /* The parser to be deleted */ - void (*freeProc)(void*) /* Function used to reclaim memory */ + void (*freeProc)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* Function used to reclaim memory */ ){ yyParser *pParser = (yyParser*)p; if( pParser==0 ) return; @@ -359,7 +359,7 @@ #if YYSTACKDEPTH<=0 free(pParser->yystack); #endif - (*freeProc)((void*)pParser); + (*freeProc)((void*)pParser ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); } /*
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php