tony2001 Mon Apr 23 10:05:33 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre php_pcre.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.16&r2=1.168.2.9.2.17&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.16
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.17
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.16 Wed Mar 14 23:47:44 2007
+++ php-src/ext/pcre/php_pcre.c Mon Apr 23 10:05:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.16 2007/03/14 23:47:44 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.17 2007/04/23 10:05:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -59,7 +59,7 @@
ZEND_DECLARE_MODULE_GLOBALS(pcre);
-static void pcre_handle_exec_error(int pcre_code TSRMLS_DC)
+static void pcre_handle_exec_error(int pcre_code TSRMLS_DC) /* {{{ */
{
int preg_code = 0;
@@ -83,9 +83,9 @@
PCRE_G(error_code) = preg_code;
}
+/* }}} */
-
-static void php_free_pcre_cache(void *data)
+static void php_free_pcre_cache(void *data) /* {{{ */
{
pcre_cache_entry *pce = (pcre_cache_entry *) data;
if (!pce) return;
@@ -96,20 +96,22 @@
pefree(pce->locale, 1);
#endif
}
+/* }}} */
-
-static PHP_GINIT_FUNCTION(pcre)
+static PHP_GINIT_FUNCTION(pcre) /* {{{ */
{
zend_hash_init(&pcre_globals->pcre_cache, 0, NULL, php_free_pcre_cache,
1);
pcre_globals->backtrack_limit = 0;
pcre_globals->recursion_limit = 0;
pcre_globals->error_code = PHP_PCRE_NO_ERROR;
}
+/* }}} */
-static PHP_GSHUTDOWN_FUNCTION(pcre)
+static PHP_GSHUTDOWN_FUNCTION(pcre) /* {{{ */
{
zend_hash_destroy(&pcre_globals->pcre_cache);
}
+/* }}} */
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("pcre.backtrack_limit", "100000", PHP_INI_ALL,
OnUpdateLong, backtrack_limit, zend_pcre_globals, pcre_globals)
@@ -462,7 +464,9 @@
php_pcre_match_impl(pce, subject, subject_len, return_value, subpats,
global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC);
}
+/* }}} */
+/* {{{ php_pcre_match_impl() */
PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int
subject_len, zval *return_value,
zval *subpats, int global, int use_flags, long flags, long start_offset
TSRMLS_DC)
{
@@ -930,7 +934,9 @@
return php_pcre_replace_impl(pce, subject, subject_len, replace_val,
is_callable_replace, result_len, limit, replace_count
TSRMLS_CC);
}
+/* }}} */
+/* {{{ php_pcre_replace_impl() */
PHPAPI char *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int
subject_len, zval *replace_val,
int is_callable_replace, int *result_len, int limit, int *replace_count
TSRMLS_DC)
{
@@ -1373,6 +1379,7 @@
php_pcre_split_impl(pce, subject, subject_len, return_value, limit_val,
flags TSRMLS_CC);
}
+/* }}} */
/* {{{ php_pcre_split
*/
@@ -1652,9 +1659,9 @@
php_pcre_grep_impl(pce, input, return_value, flags TSRMLS_CC);
}
+/* }}} */
-PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval
*return_value,
- long flags TSRMLS_DC)
+PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval
*return_value, long flags TSRMLS_DC) /* {{{ */
{
zval **entry; /* An entry in
the input array */
pcre_extra *extra = pce->extra;/* Holds results of
studying */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
