cvs: /php4/ext/wddx php_wddx_api.h wddx.c

andrei Mon Feb 28 09:16:42 2000 EDT Modified files: /php4/ext/wddx php_wddx_api.h wddx.c Log: WDDX header comments now conform to the latest DTD. Index: php4/ext/wddx/php_wddx_api.h diff -u php4/ext/wddx/php_wddx_api.h:1.5 php4/ext/wddx/php_wddx_api.h:1.6 --- php4/ext/wddx/php_wddx_api.h:1.5 Sat Feb 19 15:41:23 2000 +++ php4/ext/wddx/php_wddx_api.h Mon Feb 28 09:16:12 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_wddx_api.h,v 1.5 2000/02/19 23:41:23 zeev Exp $ */ +/* $Id: php_wddx_api.h,v 1.6 2000/02/28 17:16:12 andrei Exp $ */ #ifndef PHP_WDDX_API_H #define PHP_WDDX_API_H @@ -25,10 +25,13 @@ #define WDDX_ARRAY_E "</array>" #define WDDX_BOOLEAN "<boolean value='%s'/>" #define WDDX_CHAR "<char code='%02X'/>" +#define WDDX_COMMENT_S "<comment>" +#define WDDX_COMMENT_E "</comment>" #define WDDX_DATA_S "<data>" #define WDDX_DATA_E "</data>" #define WDDX_HEADER "<header/>" -#define WDDX_HEADER_COMMENT "<header comment='%s'/>" +#define WDDX_HEADER_S "<header>" +#define WDDX_HEADER_E "</header>" #define WDDX_NULL "<null/>" #define WDDX_NUMBER "<number>%s</number>" #define WDDX_PACKET_S "<wddxPacket version='1.0'>" Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.27 php4/ext/wddx/wddx.c:1.28 --- php4/ext/wddx/wddx.c:1.27 Thu Feb 24 08:03:27 2000 +++ php4/ext/wddx/wddx.c Mon Feb 28 09:16:12 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.27 2000/02/24 16:03:27 eschmid Exp $ */ +/* $Id: wddx.c,v 1.28 2000/02/28 17:16:12 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -263,15 +263,15 @@ /* {{{ void php_wddx_packet_start */ void php_wddx_packet_start(wddx_packet *packet, char *comment) { - char tmp_buf[WDDX_BUF_LEN]; - php_wddx_add_chunk(packet, WDDX_PACKET_S); if (comment) { - sprintf(tmp_buf, WDDX_HEADER_COMMENT, comment); - php_wddx_add_chunk(packet, tmp_buf); - } - else + php_wddx_add_chunk(packet, WDDX_HEADER_S); + php_wddx_add_chunk(packet, WDDX_COMMENT_S); + php_wddx_add_chunk(packet, comment); + php_wddx_add_chunk(packet, WDDX_COMMENT_E); + php_wddx_add_chunk(packet, WDDX_HEADER_E); + } else php_wddx_add_chunk(packet, WDDX_HEADER); php_wddx_add_chunk(packet, WDDX_DATA_S); }