com php-src: Fix macro name: ext/pcre/php_pcre.c

From: Date: Tue, 21 Nov 2017 19:27:17 +0000
Subject: com php-src: Fix macro name: ext/pcre/php_pcre.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100328@lists.php.net to get a copy of this message
Commit: c029bd3342ba5713b5baba7adf0b9f29afc2844e Author: Anatol Belski <ab@php.net> Tue, 21 Nov 2017 20:27:17 +0100 Parents: 54e7b0a6f77badba4385aabea6ebb656817df4f4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c029bd3342ba5713b5baba7adf0b9f29afc2844e Log: Fix macro name Changed paths: M ext/pcre/php_pcre.c Diff: diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index fd9f20d..8946bd8 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -558,7 +558,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) #endif php_error_docref(NULL, E_WARNING, p < ZSTR_VAL(regex) + ZSTR_LEN(regex) ? "Null byte in regex" : "Empty regular expression"); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); return NULL; } @@ -572,7 +572,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } #endif php_error_docref(NULL,E_WARNING, "Delimiter must not be alphanumeric or backslash"); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); return NULL; } @@ -623,7 +623,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } else { php_error_docref(NULL,E_WARNING, "No ending matching delimiter '%c' found", delimiter); } - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); return NULL; } @@ -673,7 +673,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } else { php_error_docref(NULL,E_WARNING, "Null byte in regex"); } - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); efree(pattern); #if HAVE_SETLOCALE if (key != regex) { @@ -718,7 +718,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) #endif pcre2_get_error_message(errnumber, error, sizeof(error)); php_error_docref(NULL,E_WARNING, "Compilation failed: %s at offset %zu", error, erroffset); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); efree(pattern); if (tables) { pefree((void*)tables, 1); @@ -738,7 +738,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } else { pcre2_get_error_message(rc, error, sizeof(error)); php_error_docref(NULL, E_WARNING, "JIT compilation failed: %s", error); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); } } #endif @@ -772,7 +772,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } #endif php_error_docref(NULL, E_WARNING, "Internal pcre2_pattern_info() error %d", rc); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); return NULL; } @@ -784,7 +784,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) } #endif php_error_docref(NULL, E_WARNING, "Internal pcre_pattern_info() error %d", rc); - pcre_handle_exec_error(PCRE_ERROR_INTERNAL); + pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); return NULL; }

« previous php.cvs (#100328) next »