From a38123e756a8e5bcbfc6df8c93aebe0e087f9f60 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Thu, 3 Oct 2002 18:30:27 +0000 Subject: [PATCH] Revert the patch for now. We'll be branching on Saturday the way it's implemented is a bit half-baked. We can always merge it into the branch at a later point. --- ext/wddx/php_wddx.h | 1 - ext/wddx/php_wddx_api.h | 12 ------ ext/wddx/wddx.c | 86 ----------------------------------------- 3 files changed, 99 deletions(-) diff --git a/ext/wddx/php_wddx.h b/ext/wddx/php_wddx.h index 7e216c0f63..a1de64e712 100644 --- a/ext/wddx/php_wddx.h +++ b/ext/wddx/php_wddx.h @@ -30,7 +30,6 @@ extern zend_module_entry wddx_module_entry; PHP_FUNCTION(wddx_serialize_value); PHP_FUNCTION(wddx_serialize_vars); -PHP_FUNCTION(wddx_serialize_type); PHP_FUNCTION(wddx_packet_start); PHP_FUNCTION(wddx_packet_end); PHP_FUNCTION(wddx_add_vars); diff --git a/ext/wddx/php_wddx_api.h b/ext/wddx/php_wddx_api.h index 0fffd54f2a..eb13ee385b 100644 --- a/ext/wddx/php_wddx_api.h +++ b/ext/wddx/php_wddx_api.h @@ -27,7 +27,6 @@ #define WDDX_ARRAY_E "" #define WDDX_BINARY_S "" #define WDDX_BINARY_E "" -#define WDDX_BINARY "%s" #define WDDX_BOOLEAN "" #define WDDX_CHAR "" #define WDDX_COMMENT_S "" @@ -48,17 +47,6 @@ #define WDDX_VAR_S "" #define WDDX_VAR_E "" -#define WDDX_NUMBER_T 0 -#define WDDX_BOOLEAN_T 1 -#define WDDX_NULL_T 2 -#define WDDX_STRING_T 3 -#define WDDX_DATETIME_T 4 -#define WDDX_ARRAY_T 5 -#define WDDX_STRUCT_T 6 -#define WDDX_RECORDSET_T 7 -#define WDDX_BINARY_T 8 - - #define php_wddx_add_chunk(packet, str) smart_str_appends(packet, str) #define php_wddx_add_chunk_ex(packet, str, len) smart_str_appendl(packet, str, len) #define php_wddx_add_chunk_static(packet, str) smart_str_appendl(packet, str, sizeof(str)-1) diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index a411761194..6a7c944035 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -96,7 +96,6 @@ static void php_wddx_process_data(void *user_data, const char *s, int len); */ function_entry wddx_functions[] = { PHP_FE(wddx_serialize_value, NULL) - PHP_FE(wddx_serialize_type, NULL) PHP_FE(wddx_serialize_vars, NULL) PHP_FE(wddx_packet_start, NULL) PHP_FE(wddx_packet_end, NULL) @@ -305,15 +304,6 @@ PS_SERIALIZER_DECODE_FUNC(wddx) PHP_MINIT_FUNCTION(wddx) { le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number); - REGISTER_LONG_CONSTANT("WDDX_BOOLEAN", WDDX_BOOLEAN_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_NUMBER", WDDX_NUMBER_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_NULL", WDDX_NULL_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_DATETIME", WDDX_DATETIME_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_ARRAY", WDDX_ARRAY_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_RECORDSET", WDDX_RECORDSET_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_STRUCT", WDDX_STRUCT_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_STRING", WDDX_STRING_T, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("WDDX_BINARY", WDDX_BINARY_T, CONST_CS | CONST_PERSISTENT); #if HAVE_PHP_SESSION php_session_register_serializer("wddx", @@ -442,24 +432,6 @@ static void php_wddx_serialize_number(wddx_packet *packet, zval *var) } /* }}} */ -/* {{{ php_wddx_serialize_binary - */ -static void php_wddx_serialize_binary(wddx_packet *packet, zval *var) -{ - char tmp_buf[WDDX_BUF_LEN]; - zval tmp; - - tmp = *var; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - - sprintf(tmp_buf, WDDX_BINARY, Z_STRVAL(tmp)); - zval_dtor(&tmp); - - php_wddx_add_chunk(packet, tmp_buf); -} -/* }}} */ - /* {{{ php_wddx_serialize_boolean */ static void php_wddx_serialize_boolean(wddx_packet *packet, zval *var) @@ -1151,64 +1123,6 @@ PHP_FUNCTION(wddx_serialize_value) } /* }}} */ -/* {{{ proto string wddx_serialize_type(mixed var, int type, [, string comment]) - Creates a new packet, serializes the given value and casts the type*/ -PHP_FUNCTION(wddx_serialize_type) -{ - zval *var; - char *comment = NULL; - int comment_len = 0, type = 0; - wddx_packet *packet; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl|s", - &var, &type, &comment, &comment_len) == FAILURE) - return; - - packet = php_wddx_constructor(); - if (!packet) { - RETURN_FALSE; - } - - php_wddx_packet_start(packet, comment, comment_len); - - switch(type) { - case WDDX_NULL_T: - php_wddx_serialize_unset(packet); - break; - case WDDX_BOOLEAN_T: - convert_to_boolean(var); - php_wddx_serialize_boolean(packet, var); - break; - case WDDX_NUMBER_T: - convert_to_long(var); - php_wddx_serialize_number(packet, var); - break; - case WDDX_DATETIME_T: /* break omitted intentionally! */ - case WDDX_STRING_T: - convert_to_string(var); - php_wddx_serialize_string(packet, var); - break; - case WDDX_ARRAY_T: - case WDDX_STRUCT_T: /* breaks omitted intentionally! */ - case WDDX_RECORDSET_T: - convert_to_array(var); - php_wddx_serialize_array(packet, var); - break; - case WDDX_BINARY_T: - php_wddx_serialize_binary(packet, var); - break; - default: - break; - } - - php_wddx_packet_end(packet); - - ZVAL_STRINGL(return_value, packet->c, packet->len, 1); - smart_str_free(packet); - efree(packet); -} -/* }}} */ - /* {{{ proto string wddx_serialize_vars(mixed var_name [, mixed ...]) Creates a new packet and serializes given variables into a struct */ PHP_FUNCTION(wddx_serialize_vars) -- 2.40.0