cvs: php-src(PHP_5_1) /ext/libxml libxml.c php_libxml.h

rrichards Thu Sep 8 06:37:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/libxml libxml.c php_libxml.h Log: MFH: add additional constants remove un-needed ifdefs http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.32.2.1&r2=1.32.2.2&ty=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.1 php-src/ext/libxml/libxml.c:1.32.2.2 --- php-src/ext/libxml/libxml.c:1.32.2.1 Thu Aug 25 22:29:56 2005 +++ php-src/ext/libxml/libxml.c Thu Sep 8 06:37:57 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: libxml.c,v 1.32.2.1 2005/08/26 02:29:56 rrichards Exp $ */ +/* $Id: libxml.c,v 1.32.2.2 2005/09/08 10:37:57 rrichards Exp $ */ #define IS_EXT_MODULE @@ -40,6 +40,7 @@ #include <libxml/tree.h> #include <libxml/uri.h> #include <libxml/xmlerror.h> +#include <libxml/xmlsave.h> #ifdef LIBXML_SCHEMAS_ENABLED #include <libxml/relaxng.h> #endif @@ -65,9 +66,7 @@ PHP_LIBXML_API php_libxml_globals libxml_globals; #endif -#if LIBXML_VERSION >= 20600 zend_class_entry *libxmlerror_class_entry; -#endif /* {{{ dynamically loadable module stuff */ #ifdef COMPILE_DL_LIBXML @@ -546,9 +545,7 @@ PHP_MINIT_FUNCTION(libxml) { -#if LIBXML_VERSION >= 20600 zend_class_entry ce; -#endif php_libxml_initialize(); @@ -563,7 +560,6 @@ REGISTER_LONG_CONSTANT("LIBXML_VERSION", LIBXML_VERSION, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("LIBXML_DOTTED_VERSION", LIBXML_DOTTED_VERSION, CONST_CS | CONST_PERSISTENT); -#if LIBXML_VERSION >= 20600 /* For use with loading xml */ REGISTER_LONG_CONSTANT("LIBXML_NOENT", XML_PARSE_NOENT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_DTDLOAD", XML_PARSE_DTDLOAD, CONST_CS | CONST_PERSISTENT); @@ -576,6 +572,11 @@ REGISTER_LONG_CONSTANT("LIBXML_NSCLEAN", XML_PARSE_NSCLEAN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_NOCDATA", XML_PARSE_NOCDATA, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LIBXML_NONET", XML_PARSE_NONET, CONST_CS | CONST_PERSISTENT); +#if LIBXML_VERSION >= 20621 + REGISTER_LONG_CONSTANT("LIBXML_COMPACT", XML_PARSE_COMPACT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LIBXML_NOXMLDECL", XML_SAVE_NO_DECL, CONST_CS | CONST_PERSISTENT); +#endif + REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG", LIBXML_SAVE_NOEMPTYTAG, CONST_CS | CONST_PERSISTENT); /* Error levels */ REGISTER_LONG_CONSTANT("LIBXML_ERR_NONE", XML_ERR_NONE, CONST_CS | CONST_PERSISTENT); @@ -585,7 +586,6 @@ INIT_CLASS_ENTRY(ce, "LibXMLError", NULL); libxmlerror_class_entry = zend_register_internal_class(&ce TSRMLS_CC); -#endif return SUCCESS; } @@ -657,7 +657,6 @@ Disable libxml errors and allow user to fetch error information as needed */ PHP_FUNCTION(libxml_use_internal_errors) { -#if LIBXML_VERSION >= 20600 xmlStructuredErrorFunc current_handler; int use_errors=0, retval; @@ -691,16 +690,12 @@ } } RETURN_BOOL(retval); -#else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Libxml 2.6 or higher is required"); -#endif } /* {{{ proto object libxml_get_last_error() Retrieve last error from libxml */ PHP_FUNCTION(libxml_get_last_error) { -#if LIBXML_VERSION >= 20600 xmlErrorPtr error; error = xmlGetLastError(); @@ -724,9 +719,6 @@ } else { RETURN_FALSE; } -#else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Libxml 2.6 or higher is required"); -#endif } /* }}} */ @@ -734,7 +726,6 @@ Retrieve array of errors */ PHP_FUNCTION(libxml_get_errors) { -#if LIBXML_VERSION >= 20600 xmlErrorPtr error; @@ -770,9 +761,6 @@ error = zend_llist_get_next(LIBXML(error_list)); } } -#else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Libxml 2.6 or higher is required"); -#endif } /* }}} */ @@ -780,14 +768,10 @@ Clear last error from libxml */ PHP_FUNCTION(libxml_clear_errors) { -#if LIBXML_VERSION >= 20600 xmlResetLastError(); if (LIBXML(error_list)) { zend_llist_clean(LIBXML(error_list)); } -#else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Libxml 2.6 or higher is required"); -#endif } /* }}} */ http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.15&r2=1.15.2.1&ty=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.15 php-src/ext/libxml/php_libxml.h:1.15.2.1 --- php-src/ext/libxml/php_libxml.h:1.15 Wed Aug 3 10:07:23 2005 +++ php-src/ext/libxml/php_libxml.h Thu Sep 8 06:37:57 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_libxml.h,v 1.15 2005/08/03 14:07:23 sniper Exp $ */ +/* $Id: php_libxml.h,v 1.15.2.1 2005/09/08 10:37:57 rrichards Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H @@ -35,6 +35,8 @@ #include "ext/standard/php_smart_str.h" #include <libxml/tree.h> +#define LIBXML_SAVE_NOEMPTYTAG 1<<2 + typedef struct { zval *stream_context; smart_str error_buffer;