CVS update: php3/functions

Date: Monday January 4, 1999 @ 12:28 Author: fmk Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv6229 Modified Files: reg.c reg.h Log Message: making _php3_regreplace callable from other api-functions and non api-functions Index: php3/functions/reg.c diff -c php3/functions/reg.c:1.96 php3/functions/reg.c:1.97 *** php3/functions/reg.c:1.96 Sun Jan 3 20:53:08 1999 --- php3/functions/reg.c Mon Jan 4 12:28:16 1999 *************** *** 28,34 **** | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ ! /* $Id: reg.c,v 1.96 1999/01/04 01:53:08 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 28,34 ---- | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ ! /* $Id: reg.c,v 1.97 1999/01/04 17:28:16 fmk Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 271,277 **** /* }}} */ /* this is the meat and potatoes of regex replacement! */ ! char *__php3_regreplace(INTERNAL_FUNCTION_PARAMETERS, const char *pattern, const char *replace, const char *string, int icase, int extended) { regex_t re; --- 271,277 ---- /* }}} */ /* this is the meat and potatoes of regex replacement! */ ! PHPAPI char * _php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended) { regex_t re; *************** *** 402,411 **** --- 402,413 ---- } /* stick that last bit of string on our output */ strcat(buf, &string[pos]); + } } _php3_regfree(&re); + buf [new_l] = '\0'; /* whew. */ return (buf); Index: php3/functions/reg.h diff -c php3/functions/reg.h:1.14 php3/functions/reg.h:1.15 *** php3/functions/reg.h:1.14 Fri Jan 1 12:59:18 1999 --- php3/functions/reg.h Mon Jan 4 12:28:16 1999 *************** *** 28,34 **** */ ! /* $Id: reg.h,v 1.14 1999/01/01 17:59:18 zeev Exp $ */ #ifndef _REG_H #define _REG_H --- 28,34 ---- */ ! /* $Id: reg.h,v 1.15 1999/01/04 17:28:16 fmk Exp $ */ #ifndef _REG_H #define _REG_H *************** *** 36,43 **** extern php3_module_entry regexp_module_entry; #define regexp_module_ptr &regexp_module_entry ! #define _php3_regreplace(a,b,c,d,e) \ ! __php3_regreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU,a,b,c,d,e) extern char *__php3_regreplace(INTERNAL_FUNCTION_PARAMETERS,const char *pattern, const char *replace, const char *string, int icase, int extended); --- 36,43 ---- extern php3_module_entry regexp_module_entry; #define regexp_module_ptr &regexp_module_entry ! //#define _php3_regreplace(a,b,c,d,e) \ ! // __php3_regreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU,a,b,c,d,e) extern char *__php3_regreplace(INTERNAL_FUNCTION_PARAMETERS,const char *pattern, const char *replace, const char *string, int icase, int extended); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net