nlopess Fri Jan 25 19:38:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre php_pcre.c php_pcre.h
Log:
spread some static keywords
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.9&r2=1.168.2.9.2.21.2.10&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.21.2.9
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.10
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.9 Sun Jan 13 14:44:29 2008
+++ php-src/ext/pcre/php_pcre.c Fri Jan 25 19:38:26 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.9 2008/01/13 14:44:29 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.10 2008/01/25 19:38:26 nlopess Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -748,7 +748,7 @@
/* {{{ proto int preg_match(string pattern, string subject [, array
subpatterns [, int flags [, int offset]]])
Perform a Perl-style regular expression match */
-PHP_FUNCTION(preg_match)
+static PHP_FUNCTION(preg_match)
{
php_do_pcre_match(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -756,7 +756,7 @@
/* {{{ proto int preg_match_all(string pattern, string subject, array
subpatterns [, int flags [, int offset]])
Perform a Perl-style global regular expression match */
-PHP_FUNCTION(preg_match_all)
+static PHP_FUNCTION(preg_match_all)
{
php_do_pcre_match(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -1369,7 +1369,7 @@
/* {{{ proto string preg_replace(mixed regex, mixed replace, mixed subject [,
int limit [, count]])
Perform Perl-style regular expression replacement. */
-PHP_FUNCTION(preg_replace)
+static PHP_FUNCTION(preg_replace)
{
preg_replace_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -1377,7 +1377,7 @@
/* {{{ proto string preg_replace_callback(mixed regex, mixed callback, mixed
subject [, int limit [, count]])
Perform Perl-style regular expression replacement using replacement
callback. */
-PHP_FUNCTION(preg_replace_callback)
+static PHP_FUNCTION(preg_replace_callback)
{
preg_replace_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -1385,7 +1385,7 @@
/* {{{ proto array preg_split(string pattern, string subject [, int limit [,
int flags]])
Split string into an array using a perl-style regular expression as a
delimiter */
-PHP_FUNCTION(preg_split)
+static PHP_FUNCTION(preg_split)
{
char *regex; /* Regular
expression */
char *subject; /* String to
match against */
@@ -1583,7 +1583,7 @@
/* {{{ proto string preg_quote(string str [, string delim_char])
Quote regular expression characters plus an optional character */
-PHP_FUNCTION(preg_quote)
+static PHP_FUNCTION(preg_quote)
{
int in_str_len;
char *in_str; /* Input string argument */
@@ -1669,7 +1669,7 @@
/* {{{ proto array preg_grep(string regex, array input [, int flags])
Searches array and returns entries which match regex */
-PHP_FUNCTION(preg_grep)
+static PHP_FUNCTION(preg_grep)
{
char *regex; /* Regular
expression */
int regex_len;
@@ -1779,7 +1779,7 @@
/* {{{ proto int preg_last_error()
Returns the error code of the last regexp execution. */
-PHP_FUNCTION(preg_last_error)
+static PHP_FUNCTION(preg_last_error)
{
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
return;
@@ -1791,7 +1791,7 @@
/* {{{ module definition structures */
-const zend_function_entry pcre_functions[] = {
+static const zend_function_entry pcre_functions[] = {
PHP_FE(preg_match, third_arg_force_ref)
PHP_FE(preg_match_all, third_arg_force_ref)
PHP_FE(preg_replace, fifth_arg_force_ref)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.h?r1=1.41.2.1.2.5.2.1&r2=1.41.2.1.2.5.2.2&diff_format=u
Index: php-src/ext/pcre/php_pcre.h
diff -u php-src/ext/pcre/php_pcre.h:1.41.2.1.2.5.2.1
php-src/ext/pcre/php_pcre.h:1.41.2.1.2.5.2.2
--- php-src/ext/pcre/php_pcre.h:1.41.2.1.2.5.2.1 Mon Dec 31 07:17:11 2007
+++ php-src/ext/pcre/php_pcre.h Fri Jan 25 19:38:26 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.h,v 1.41.2.1.2.5.2.1 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: php_pcre.h,v 1.41.2.1.2.5.2.2 2008/01/25 19:38:26 nlopess Exp $ */
#ifndef PHP_PCRE_H
#define PHP_PCRE_H
@@ -33,14 +33,6 @@
#include <locale.h>
#endif
-PHP_FUNCTION(preg_match);
-PHP_FUNCTION(preg_match_all);
-PHP_FUNCTION(preg_replace);
-PHP_FUNCTION(preg_replace_callback);
-PHP_FUNCTION(preg_split);
-PHP_FUNCTION(preg_quote);
-PHP_FUNCTION(preg_grep);
-
PHPAPI char *php_pcre_replace(char *regex, int regex_len, char *subject, int
subject_len, zval *replace_val, int is_callable_replace, int *result_len, int
limit, int *replace_count TSRMLS_DC);
PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int
*options TSRMLS_DC);
PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int
*preg_options, int *coptions TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
