From 4a2e40bb861bc3cf5fb6863e57486ed60316e97c Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 30 Jun 2015 04:05:24 +0300 Subject: Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). --- ext/standard/uuencode.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'ext/standard/uuencode.c') diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index 91de87a194..6520dda376 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -73,7 +73,7 @@ PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */ /* encoded length is ~ 38% greater than the original */ dest = zend_string_alloc((size_t)ceil(src_len * 1.38) + 46, 0); - p = dest->val; + p = ZSTR_VAL(dest); s = src; e = src + src_len; @@ -122,7 +122,7 @@ PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */ *p++ = '\n'; *p = '\0'; - dest = zend_string_truncate(dest, p - dest->val, 0); + dest = zend_string_truncate(dest, p - ZSTR_VAL(dest), 0); return dest; } /* }}} */ @@ -134,7 +134,7 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */ zend_string *dest; dest = zend_string_alloc((size_t) ceil(src_len * 0.75), 0); - p = dest->val; + p = ZSTR_VAL(dest); s = src; e = src + src_len; @@ -173,8 +173,8 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */ s++; } - assert(p >= dest->val); - if ((len = total_len > (size_t)(p - dest->val))) { + assert(p >= ZSTR_VAL(dest)); + if ((len = total_len > (size_t)(p - ZSTR_VAL(dest)))) { *p++ = PHP_UU_DEC(*s) << 2 | PHP_UU_DEC(*(s + 1)) >> 4; if (len > 1) { *p++ = PHP_UU_DEC(*(s + 1)) << 4 | PHP_UU_DEC(*(s + 2)) >> 2; @@ -184,8 +184,8 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */ } } - dest->len = total_len; - dest->val[dest->len] = '\0'; + ZSTR_LEN(dest) = total_len; + ZSTR_VAL(dest)[ZSTR_LEN(dest)] = '\0'; return dest; @@ -202,11 +202,11 @@ PHP_FUNCTION(convert_uuencode) { zend_string *src; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &src) == FAILURE || src->len < 1) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &src) == FAILURE || ZSTR_LEN(src) < 1) { RETURN_FALSE; } - RETURN_STR(php_uuencode(src->val, src->len)); + RETURN_STR(php_uuencode(ZSTR_VAL(src), ZSTR_LEN(src))); } /* }}} */ @@ -217,11 +217,11 @@ PHP_FUNCTION(convert_uudecode) zend_string *src; zend_string *dest; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &src) == FAILURE || src->len < 1) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &src) == FAILURE || ZSTR_LEN(src) < 1) { RETURN_FALSE; } - if ((dest = php_uudecode(src->val, src->len)) == NULL) { + if ((dest = php_uudecode(ZSTR_VAL(src), ZSTR_LEN(src))) == NULL) { php_error_docref(NULL, E_WARNING, "The given parameter is not a valid uuencoded string"); RETURN_FALSE; } -- cgit v1.2.1