cvs: php4 /ext/standard base64.c

andrei Fri Oct 26 10:50:58 2001 EDT Modified files: /php4/ext/standard base64.c Log: Convert to use new parameter parsing API. Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.26 php4/ext/standard/base64.c:1.27 --- php4/ext/standard/base64.c:1.26 Sun Sep 9 09:29:14 2001 +++ php4/ext/standard/base64.c Fri Oct 26 10:50:58 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.26 2001/09/09 13:29:14 derick Exp $ */ +/* $Id: base64.c,v 1.27 2001/10/26 14:50:58 andrei Exp $ */ #include <string.h> @@ -153,15 +153,14 @@ Encodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_encode) { - pval **str; + char *str; unsigned char *result; - int ret_length; + int str_len, ret_length; - if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + return; } - convert_to_string_ex(str); - result = php_base64_encode(Z_STRVAL_PP(str), Z_STRLEN_PP(str), &ret_length); + result = php_base64_encode(str, str_len, &ret_length); if (result != NULL) { RETVAL_STRINGL(result, ret_length, 0); } else { @@ -175,15 +174,14 @@ Decodes string using MIME base64 algorithm */ PHP_FUNCTION(base64_decode) { - pval **str; + char *str; unsigned char *result; - int ret_length; + int str_len, ret_length; - if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + return; } - convert_to_string_ex(str); - result = php_base64_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str), &ret_length); + result = php_base64_decode(str, str_len, &ret_length); if (result != NULL) { RETVAL_STRINGL(result, ret_length, 0); } else {