diff options
| author | Anatol Belski <ab@php.net> | 2014-09-14 21:38:46 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-14 21:38:46 +0200 |
| commit | a7482fd2bf340e03b5c5c5ac4f94aacdabccb1ce (patch) | |
| tree | 1ea0de3e76bfec03f761cc82728e4972c2e32da3 /ext/xml/xml.c | |
| parent | 90972355b3d23e8c099e119cb7b2e0fbb463beab (diff) | |
| download | php-git-a7482fd2bf340e03b5c5c5ac4f94aacdabccb1ce.tar.gz | |
make xml_utf8_ encode/decode work with size_t
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 2ad53e77e9..ee2d7dad5e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -554,9 +554,9 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) /* }}} */ /* {{{ xml_utf8_encode() */ -PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *encoding) +PHPAPI zend_string *xml_utf8_encode(const char *s, size_t len, const XML_Char *encoding) { - int pos = len; + size_t pos = len; zend_string *str; unsigned int c; unsigned short (*encoder)(unsigned char) = NULL; @@ -605,7 +605,7 @@ PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *enco /* }}} */ /* {{{ xml_utf8_decode() */ -PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char *encoding) +PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, size_t len, const XML_Char *encoding) { size_t pos = 0; unsigned int c; @@ -627,7 +627,7 @@ PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char * str = zend_string_alloc(len, 0); str->len = 0; - while (pos < (size_t)len) { + while (pos < len) { int status = FAILURE; c = php_next_utf8_char((const unsigned char*)s, (size_t) len, &pos, &status); |