cvs: php4 /ext/domxml php_domxml.c

chregu Fri May 3 05:45:09 2002 EDT Modified files: /php4/ext/domxml php_domxml.c Log: added encoding support for domxml_dump_mem() Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.145 php4/ext/domxml/php_domxml.c:1.146 --- php4/ext/domxml/php_domxml.c:1.145 Tue Apr 30 01:18:12 2002 +++ php4/ext/domxml/php_domxml.c Fri May 3 05:45:09 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.145 2002/04/30 05:18:12 steinm Exp $ */ +/* $Id: php_domxml.c,v 1.146 2002/05/03 09:45:09 chregu Exp $ */ /* TODO * - Support Notation Nodes @@ -3188,7 +3188,7 @@ } /* }}} */ -/* {{{ proto string domxml_dump_mem(object doc_handle [, int format]) +/* {{{ proto string domxml_dump_mem(object doc_handle [, int format][, encoding]) Dumps document into string and optionally formats it */ PHP_FUNCTION(domxml_dump_mem) { @@ -3197,13 +3197,24 @@ xmlChar *mem; int format = 0; int size; + int encoding_len = 0; + char *encoding; + - DOMXML_PARAM_ONE(docp, id, le_domxmldocp,"|l", &format); + DOMXML_PARAM_THREE(docp, id, le_domxmldocp,"|ls", &format,&encoding,&encoding_len); if (format) { xmlKeepBlanksDefault(0); - xmlDocDumpFormatMemory(docp, &mem, &size, format); + if (encoding_len) { + xmlDocDumpFormatMemoryEnc(docp, &mem, &size, encoding, format ); + } else { + xmlDocDumpFormatMemory(docp, &mem, &size, format); + } } else { - xmlDocDumpMemory(docp, &mem, &size); + if (encoding_len) { + xmlDocDumpMemoryEnc(docp, &mem, &size, encoding); + } else { + xmlDocDumpMemory(docp, &mem, &size); + } } if (!size) { @@ -3254,7 +3265,7 @@ int level = 0; int format = 0; - DOMXML_PARAM_THREE(docp, id, le_domxmldocp,"o|ll",&nodep,&format,&level); + DOMXML_PARAM_THREE(docp, id, le_domxmldocp,"o|lls",&nodep,&format,&level); DOMXML_GET_OBJ(elementp, nodep, le_domxmlnodep);