archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- New parameter parsing API

Browse source
This commit is contained in:
Felipe Pena 2008-06-20 19:57:25 +00:00
parent 8a65886bb9
commit f23acf749d
1 changed files with 18 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

51
ext/wddx/wddx.c
View file

@ -1148,20 +1148,12 @@ PHP_FUNCTION(wddx_serialize_value)
Creates a new packet and serializes given variables into a struct */ Creates a new packet and serializes given variables into a struct */
PHP_FUNCTION(wddx_serialize_vars) PHP_FUNCTION(wddx_serialize_vars)
{ {
int argc, i; int num_args, i;
wddx_packet *packet; wddx_packet *packet;
zval ***args; zval ***args = NULL;
argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
if (argc < 1) { return;
WRONG_PARAM_COUNT;
}
/* Allocate arguments array and get the arguments, checking for errors. */
args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
efree(args);
WRONG_PARAM_COUNT;
} }
packet = php_wddx_constructor(); packet = php_wddx_constructor();
@ -1169,9 +1161,10 @@ PHP_FUNCTION(wddx_serialize_vars)
php_wddx_packet_start(packet, NULL, 0); php_wddx_packet_start(packet, NULL, 0);
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S); php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
for (i=0; i<argc; i++) { for (i=0; i<num_args; i++) {
if (Z_TYPE_PP(args[i]) != IS_ARRAY && Z_TYPE_PP(args[i]) != IS_OBJECT) if (Z_TYPE_PP(args[i]) != IS_ARRAY && Z_TYPE_PP(args[i]) != IS_OBJECT) {
convert_to_string_ex(args[i]); convert_to_string_ex(args[i]);
}
php_wddx_add_var(packet, *args[i]); php_wddx_add_var(packet, *args[i]);
} }
@ -1256,35 +1249,25 @@ PHP_FUNCTION(wddx_packet_end)
Serializes given variables and adds them to packet given by packet_id */ Serializes given variables and adds them to packet given by packet_id */
PHP_FUNCTION(wddx_add_vars) PHP_FUNCTION(wddx_add_vars)
{ {
int argc, i; int num_args, i;
zval ***args; zval ***args = NULL;
zval **packet_id; long packet_id;
wddx_packet *packet = NULL; wddx_packet *packet = NULL;
argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l+", packet_id, &args, &num_args) == FAILURE) {
if (argc < 2) { return;
WRONG_PARAM_COUNT;
} }
/* Allocate arguments array and get the arguments, checking for errors. */ packet = (wddx_packet *)zend_fetch_resource(&packet_id TSRMLS_CC, -1, "WDDX packet ID", NULL, 1, le_wddx);
args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0); if (!packet) {
if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
efree(args);
WRONG_PARAM_COUNT;
}
packet_id = args[0];
packet = (wddx_packet *)zend_fetch_resource(packet_id TSRMLS_CC, -1, "WDDX packet ID", NULL, 1, le_wddx);
if (!packet)
{
efree(args); efree(args);
RETURN_FALSE; RETURN_FALSE;
} }
for (i=1; i<argc; i++) { for (i=1; i<num_args; i++) {
if (Z_TYPE_PP(args[i]) != IS_ARRAY && Z_TYPE_PP(args[i]) != IS_OBJECT) if (Z_TYPE_PP(args[i]) != IS_ARRAY && Z_TYPE_PP(args[i]) != IS_OBJECT) {
convert_to_string_ex(args[i]); convert_to_string_ex(args[i]);
}
php_wddx_add_var(packet, (*args[i])); php_wddx_add_var(packet, (*args[i]));
} }