]> granicus.if.org Git - php/commitdiff
Fix macro name
authorAnatol Belski <ab@php.net>
Tue, 21 Nov 2017 19:27:17 +0000 (20:27 +0100)
committerAnatol Belski <ab@php.net>
Tue, 21 Nov 2017 19:27:17 +0000 (20:27 +0100)
ext/pcre/php_pcre.c

index fd9f20d4a3f66166474c5283066bd1b9bb5f233c..8946bd86e26b2c87d1afb0e7784cbe56a5c2a4f5 100644 (file)
@@ -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;
        }