com php-src: rename php_mb_check_forbidden_encoding t o php_mb_check_unsupported_encoding: ext/mbstring /mbstring.c

From: Date: Sat, 07 Mar 2015 17:03:45 +0000
Subject: com php-src: rename php_mb_check_forbidden_encoding t o php_mb_check_unsupported_encoding: ext/mbstring /mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93707@lists.php.net to get a copy of this message
Commit: 325faea56fcd91a18a663486de204b7c5db1ae0d Author: Masaki Kagaya <masakielastic@gmail.com> Fri, 20 Feb 2015 18:29:34 +0900 Parents: 2e97d7be3b1048a699afc31292b0316082becca7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=325faea56fcd91a18a663486de204b7c5db1ae0d Log: rename php_mb_check_forbidden_encoding to php_mb_check_unsupported_encoding Changed paths: M ext/mbstring/mbstring.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ce692ae..d0dc42c 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -4590,7 +4590,7 @@ PHP_FUNCTION(mb_check_encoding) } /* }}} */ -static inline zend_bool php_mb_check_forbidden_encoding(enum mbfl_no_encoding no_enc) +static inline zend_bool php_mb_check_unsupported_encoding(enum mbfl_no_encoding no_enc) { if (no_enc == mbfl_no_encoding_pass || no_enc == mbfl_no_encoding_auto @@ -4677,7 +4677,7 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char* enc) return cp; - } else if (php_mb_check_forbidden_encoding(no_enc)) { + } else if (php_mb_check_unsupported_encoding(no_enc)) { php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); return -1; } @@ -4790,7 +4790,7 @@ static inline char* php_mb_chr(long cp, const char* enc) zend_string_release(buf); return ret; - } else if (php_mb_check_forbidden_encoding(no_enc)) { + } else if (php_mb_check_unsupported_encoding(no_enc)) { php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); return NULL; }

« previous php.cvs (#93707) next »