1 files changed, 14 insertions, 16 deletions

diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index 0689de5636..40ab379a30 100644
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -65,14 +65,14 @@
 
 #define PHP_UU_DEC(c) (((c) - ' ') & 077)
 
-PHPAPI zend_string *php_uuencode(char *src, int src_len) /* {{{ */
+PHPAPI zend_string *php_uuencode(char *src, size_t src_len) /* {{{ */
 {
-	int len = 45;
+	size_t len = 45;
 	char *p, *s, *e, *ee;
 	zend_string *dest;
 
 	/* encoded length is ~ 38% greater than the original */
-	dest = STR_ALLOC((size_t)ceil(src_len * 1.38) + 46, 0);
+	dest = zend_string_alloc((size_t)ceil(src_len * 1.38) + 46, 0);
 	p = dest->val;
 	s = src;
 	e = src + src_len;
@@ -122,18 +122,18 @@ PHPAPI zend_string *php_uuencode(char *src, int src_len) /* {{{ */
 	*p++ = '\n';
 	*p = '\0';
 
-	dest = STR_REALLOC(dest, p - dest->val, 0);
+	dest = zend_string_realloc(dest, p - dest->val, 0);
 	return dest;
 }
 /* }}} */
 
-PHPAPI zend_string *php_uudecode(char *src, int src_len) /* {{{ */
+PHPAPI zend_string *php_uudecode(char *src, size_t src_len) /* {{{ */
 {
-	int len, total_len=0;
+	size_t len, total_len=0;
 	char *s, *e, *p, *ee;
 	zend_string *dest;
 
-	dest = STR_ALLOC((size_t) ceil(src_len * 0.75), 0);
+	dest = zend_string_alloc((size_t) ceil(src_len * 0.75), 0);
 	p = dest->val;
 	s = src;
 	e = src + src_len;
@@ -189,7 +189,7 @@ PHPAPI zend_string *php_uudecode(char *src, int src_len) /* {{{ */
 	return dest;
 
 err:
-	STR_FREE(dest);
+	zend_string_free(dest);
 
 	return NULL;
 }
@@ -199,14 +199,13 @@ err:
    uuencode a string */
 PHP_FUNCTION(convert_uuencode)
 {
-	char *src;
-	int src_len;
+	zend_string *src;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &src, &src_len) == FAILURE || src_len < 1) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &src) == FAILURE || src->len < 1) {
 		RETURN_FALSE;
 	}
 
-	RETURN_STR(php_uuencode(src, src_len));
+	RETURN_STR(php_uuencode(src->val, src->len));
 }
 /* }}} */
 
@@ -214,15 +213,14 @@ PHP_FUNCTION(convert_uuencode)
    decode a uuencoded string */
 PHP_FUNCTION(convert_uudecode)
 {
-	char *src;
-	int src_len;
+	zend_string *src;
 	zend_string *dest;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &src, &src_len) == FAILURE || src_len < 1) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &src) == FAILURE || src->len < 1) {
 		RETURN_FALSE;
 	}
 
-	if ((dest = php_uudecode(src, src_len)) == NULL) {
+	if ((dest = php_uudecode(src->val, src->len)) == NULL) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string");
 		RETURN_FALSE;
 	}