diff options
| -rw-r--r-- | ext/pcre/php_pcre.c | 18 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.h | 8 |
2 files changed, 9 insertions, 17 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 07abff432f..f0f1f2c601 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -748,7 +748,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* {{{ 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 @@ PHP_FUNCTION(preg_match) /* {{{ 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 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callabl /* {{{ 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 @@ PHP_FUNCTION(preg_replace) /* {{{ 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 @@ PHP_FUNCTION(preg_replace_callback) /* {{{ 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 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, char *subject, int subjec /* {{{ 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 @@ PHP_FUNCTION(preg_quote) /* {{{ 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 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return /* {{{ 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 @@ PHP_FUNCTION(preg_last_error) /* {{{ 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) diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index 696bb59524..2e4555adba 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/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); |