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

MFB

Browse source
This commit is contained in:
Nuno Lopes 2006-11-10 18:05:58 +00:00
parent dcc12b4f70
commit 80507d62ea
2 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

62
ext/libxml/libxml.c
View file

@ -52,7 +52,7 @@
#define PHP_LIBXML_CTX_WARNING 2 #define PHP_LIBXML_CTX_WARNING 2
/* a true global for initialization */ /* a true global for initialization */
int _php_libxml_initialized = 0; static int _php_libxml_initialized = 0;
typedef struct _php_libxml_func_handler { typedef struct _php_libxml_func_handler {
php_libxml_export_node export_func; php_libxml_export_node export_func;
@ -60,10 +60,16 @@ typedef struct _php_libxml_func_handler {
static HashTable php_libxml_exports; static HashTable php_libxml_exports;
ZEND_DECLARE_MODULE_GLOBALS(libxml) static ZEND_DECLARE_MODULE_GLOBALS(libxml)
static PHP_GINIT_FUNCTION(libxml); static PHP_GINIT_FUNCTION(libxml);
zend_class_entry *libxmlerror_class_entry; static PHP_FUNCTION(libxml_set_streams_context);
static PHP_FUNCTION(libxml_use_internal_errors);
static PHP_FUNCTION(libxml_get_last_error);
static PHP_FUNCTION(libxml_clear_errors);
static PHP_FUNCTION(libxml_get_errors);
static zend_class_entry *libxmlerror_class_entry;
/* {{{ dynamically loadable module stuff */ /* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_LIBXML #ifdef COMPILE_DL_LIBXML
@ -72,11 +78,11 @@ ZEND_GET_MODULE(libxml)
/* }}} */ /* }}} */
/* {{{ function prototypes */ /* {{{ function prototypes */
PHP_MINIT_FUNCTION(libxml); static PHP_MINIT_FUNCTION(libxml);
PHP_RINIT_FUNCTION(libxml); static PHP_RINIT_FUNCTION(libxml);
PHP_MSHUTDOWN_FUNCTION(libxml); static PHP_MSHUTDOWN_FUNCTION(libxml);
PHP_RSHUTDOWN_FUNCTION(libxml); static PHP_RSHUTDOWN_FUNCTION(libxml);
PHP_MINFO_FUNCTION(libxml); static PHP_MINFO_FUNCTION(libxml);
/* }}} */ /* }}} */
@ -106,7 +112,7 @@ ZEND_END_ARG_INFO()
/* }}} */ /* }}} */
/* {{{ extension definition structures */ /* {{{ extension definition structures */
zend_function_entry libxml_functions[] = { static zend_function_entry libxml_functions[] = {
PHP_FE(libxml_set_streams_context, arginfo_libxml_set_streams_context) PHP_FE(libxml_set_streams_context, arginfo_libxml_set_streams_context)
PHP_FE(libxml_use_internal_errors, arginfo_libxml_use_internal_errors) PHP_FE(libxml_use_internal_errors, arginfo_libxml_use_internal_errors)
PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error) PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error)
@ -270,7 +276,7 @@ static PHP_GINIT_FUNCTION(libxml)
/* Channel libxml file io layer through the PHP streams subsystem. /* Channel libxml file io layer through the PHP streams subsystem.
* This allows use of ftps:// and https:// urls */ * This allows use of ftps:// and https:// urls */
void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode, const int read_only) static void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode, const int read_only)
{ {
php_stream_statbuf ssbuf; php_stream_statbuf ssbuf;
php_stream_context *context = NULL; php_stream_context *context = NULL;
@ -325,35 +331,35 @@ void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode,
return ret_val; return ret_val;
} }
void *php_libxml_streams_IO_open_read_wrapper(const char *filename) static void *php_libxml_streams_IO_open_read_wrapper(const char *filename)
{ {
return php_libxml_streams_IO_open_wrapper(filename, "rb", 1); return php_libxml_streams_IO_open_wrapper(filename, "rb", 1);
} }
void *php_libxml_streams_IO_open_write_wrapper(const char *filename) static void *php_libxml_streams_IO_open_write_wrapper(const char *filename)
{ {
return php_libxml_streams_IO_open_wrapper(filename, "wb", 0); return php_libxml_streams_IO_open_wrapper(filename, "wb", 0);
} }
int php_libxml_streams_IO_read(void *context, char *buffer, int len) static int php_libxml_streams_IO_read(void *context, char *buffer, int len)
{ {
TSRMLS_FETCH(); TSRMLS_FETCH();
return php_stream_read((php_stream*)context, buffer, len); return php_stream_read((php_stream*)context, buffer, len);
} }
int php_libxml_streams_IO_write(void *context, const char *buffer, int len) static int php_libxml_streams_IO_write(void *context, const char *buffer, int len)
{ {
TSRMLS_FETCH(); TSRMLS_FETCH();
return php_stream_write((php_stream*)context, buffer, len); return php_stream_write((php_stream*)context, buffer, len);
} }
int php_libxml_streams_IO_close(void *context) static int php_libxml_streams_IO_close(void *context)
{ {
TSRMLS_FETCH(); TSRMLS_FETCH();
return php_stream_close((php_stream*)context); return php_stream_close((php_stream*)context);
} }
xmlParserInputBufferPtr static xmlParserInputBufferPtr
php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc) php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
{ {
xmlParserInputBufferPtr ret; xmlParserInputBufferPtr ret;
@ -380,7 +386,7 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
return(ret); return(ret);
} }
xmlOutputBufferPtr static xmlOutputBufferPtr
php_libxml_output_buffer_create_filename(const char *URI, php_libxml_output_buffer_create_filename(const char *URI,
xmlCharEncodingHandlerPtr encoder, xmlCharEncodingHandlerPtr encoder,
int compression ATTRIBUTE_UNUSED) int compression ATTRIBUTE_UNUSED)
@ -405,7 +411,7 @@ php_libxml_output_buffer_create_filename(const char *URI,
xmlFree(unescaped); xmlFree(unescaped);
} }
/* try with a non-escaped URI this may be a strange filename */ /* try with a non-escaped URI this may be a strange filename */
if (context == NULL) { if (context == NULL) {
context = php_libxml_streams_IO_open_write_wrapper(URI); context = php_libxml_streams_IO_open_write_wrapper(URI);
} }
@ -590,7 +596,7 @@ PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC) {
} }
PHP_MINIT_FUNCTION(libxml) static PHP_MINIT_FUNCTION(libxml)
{ {
zend_class_entry ce; zend_class_entry ce;
@ -630,7 +636,7 @@ PHP_MINIT_FUNCTION(libxml)
} }
PHP_RINIT_FUNCTION(libxml) static PHP_RINIT_FUNCTION(libxml)
{ {
/* report errors via handler rather than stderr */ /* report errors via handler rather than stderr */
xmlSetGenericErrorFunc(NULL, php_libxml_error_handler); xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
@ -640,7 +646,7 @@ PHP_RINIT_FUNCTION(libxml)
} }
PHP_MSHUTDOWN_FUNCTION(libxml) static PHP_MSHUTDOWN_FUNCTION(libxml)
{ {
php_libxml_shutdown(); php_libxml_shutdown();
@ -648,7 +654,7 @@ PHP_MSHUTDOWN_FUNCTION(libxml)
} }
PHP_RSHUTDOWN_FUNCTION(libxml) static PHP_RSHUTDOWN_FUNCTION(libxml)
{ {
/* reset libxml generic error handling */ /* reset libxml generic error handling */
xmlSetGenericErrorFunc(NULL, NULL); xmlSetGenericErrorFunc(NULL, NULL);
@ -672,7 +678,7 @@ PHP_RSHUTDOWN_FUNCTION(libxml)
} }
PHP_MINFO_FUNCTION(libxml) static PHP_MINFO_FUNCTION(libxml)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row(2, "libXML support", "active"); php_info_print_table_row(2, "libXML support", "active");
@ -684,7 +690,7 @@ PHP_MINFO_FUNCTION(libxml)
/* {{{ proto void libxml_set_streams_context(resource streams_context) /* {{{ proto void libxml_set_streams_context(resource streams_context)
Set the streams context for the next libxml document load or write */ Set the streams context for the next libxml document load or write */
PHP_FUNCTION(libxml_set_streams_context) static PHP_FUNCTION(libxml_set_streams_context)
{ {
zval *arg; zval *arg;
@ -702,7 +708,7 @@ PHP_FUNCTION(libxml_set_streams_context)
/* {{{ proto void libxml_use_internal_errors([boolean use_errors]) /* {{{ proto void libxml_use_internal_errors([boolean use_errors])
Disable libxml errors and allow user to fetch error information as needed */ Disable libxml errors and allow user to fetch error information as needed */
PHP_FUNCTION(libxml_use_internal_errors) static PHP_FUNCTION(libxml_use_internal_errors)
{ {
xmlStructuredErrorFunc current_handler; xmlStructuredErrorFunc current_handler;
zend_bool use_errors=0, retval; zend_bool use_errors=0, retval;
@ -742,7 +748,7 @@ PHP_FUNCTION(libxml_use_internal_errors)
/* {{{ proto object libxml_get_last_error() /* {{{ proto object libxml_get_last_error()
Retrieve last error from libxml */ Retrieve last error from libxml */
PHP_FUNCTION(libxml_get_last_error) static PHP_FUNCTION(libxml_get_last_error)
{ {
xmlErrorPtr error; xmlErrorPtr error;
@ -772,7 +778,7 @@ PHP_FUNCTION(libxml_get_last_error)
/* {{{ proto object libxml_get_errors() /* {{{ proto object libxml_get_errors()
Retrieve array of errors */ Retrieve array of errors */
PHP_FUNCTION(libxml_get_errors) static PHP_FUNCTION(libxml_get_errors)
{ {
xmlErrorPtr error; xmlErrorPtr error;
@ -814,7 +820,7 @@ PHP_FUNCTION(libxml_get_errors)
/* {{{ proto void libxml_clear_errors() /* {{{ proto void libxml_clear_errors()
Clear last error from libxml */ Clear last error from libxml */
PHP_FUNCTION(libxml_clear_errors) static PHP_FUNCTION(libxml_clear_errors)
{ {
xmlResetLastError(); xmlResetLastError();
if (LIBXML(error_list)) { if (LIBXML(error_list)) {

6
ext/libxml/php_libxml.h
View file

@ -75,12 +75,6 @@ typedef struct _php_libxml_node_object {
typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC); typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);
PHP_FUNCTION(libxml_set_streams_context);
PHP_FUNCTION(libxml_use_internal_errors);
PHP_FUNCTION(libxml_get_last_error);
PHP_FUNCTION(libxml_clear_errors);
PHP_FUNCTION(libxml_get_errors);
int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr node, void *private_data TSRMLS_DC); int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr node, void *private_data TSRMLS_DC);
int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC); int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC);
PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr docp TSRMLS_DC); PHP_LIBXML_API int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr docp TSRMLS_DC);