helly Wed Oct 12 18:45:15 2005 EDT
Modified files:
/php-src/ext/pcre php_pcre.c php_pcre.h
Log:
- Drop one cache related function which is not really neccessary
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.172&r2=1.173&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.172 php-src/ext/pcre/php_pcre.c:1.173
--- php-src/ext/pcre/php_pcre.c:1.172 Wed Oct 12 18:37:29 2005
+++ php-src/ext/pcre/php_pcre.c Wed Oct 12 18:45:15 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.172 2005/10/12 22:37:29 helly Exp $ */
+/* $Id: php_pcre.c,v 1.173 2005/10/12 22:45:15 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -124,9 +124,9 @@
}
/* }}} */
-/* {{{ pcre_get_compiled_regex_cache_ex
+/* {{{ pcre_get_compiled_regex_cache
*/
-static pcre_cache_entry* pcre_get_compiled_regex_cache_ex(char *regex, int
regex_len, pcre_extra **extra, int *preg_options, int *compile_options
TSRMLS_DC)
+PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int
regex_len, pcre_extra **extra, int *preg_options, int *compile_options
TSRMLS_DC)
{
pcre *re = NULL;
int coptions = 0;
@@ -335,7 +335,7 @@
PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int
*preg_options TSRMLS_DC)
{
int compile_options;
- pcre_cache_entry * pce = pcre_get_compiled_regex_cache_ex(regex,
strlen(regex), extra, preg_options, &compile_options TSRMLS_CC);
+ pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex,
strlen(regex), extra, preg_options, &compile_options TSRMLS_CC);
return pce ? pce->re : NULL;
}
@@ -345,23 +345,12 @@
*/
PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int
*preg_options, int *compile_options TSRMLS_DC)
{
- pcre_cache_entry * pce = pcre_get_compiled_regex_cache_ex(regex,
strlen(regex), extra, preg_options, compile_options TSRMLS_CC);
+ pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex,
strlen(regex), extra, preg_options, compile_options TSRMLS_CC);
return pce ? pce->re : NULL;
}
/* }}} */
-/* {{{ pcre_get_compiled_regex_cache
- */
-PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int
regex_len TSRMLS_DC)
-{
- pcre_extra *extra;
- int preg_options;
- int compile_options;
- return pcre_get_compiled_regex_cache_ex(regex, regex_len, &extra,
&preg_options, &compile_options TSRMLS_CC);
-}
-/* }}} */
-
/* {{{ add_offset_pair */
static inline void add_offset_pair(zval *result, char *str, int len, int
offset, char *name)
{
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.h?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/pcre/php_pcre.h
diff -u php-src/ext/pcre/php_pcre.h:1.42 php-src/ext/pcre/php_pcre.h:1.43
--- php-src/ext/pcre/php_pcre.h:1.42 Wed Oct 12 18:37:30 2005
+++ php-src/ext/pcre/php_pcre.h Wed Oct 12 18:45:15 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.h,v 1.42 2005/10/12 22:37:30 helly Exp $ */
+/* $Id: php_pcre.h,v 1.43 2005/10/12 22:45:15 helly Exp $ */
#ifndef PHP_PCRE_H
#define PHP_PCRE_H
@@ -60,7 +60,7 @@
int refcount;
} pcre_cache_entry;
-PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int
regex_len TSRMLS_DC);
+PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int
regex_len, pcre_extra **extra, int *preg_options, int *compile_options
TSRMLS_DC);
ZEND_BEGIN_MODULE_GLOBALS(pcre)
HashTable pcre_cache;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
