jani Sat Jul 21 00:51:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c php_libxml.h
Log:
MFH: cs+ws+compile warning fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.12&r2=1.32.2.7.2.13&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.12
php-src/ext/libxml/libxml.c:1.32.2.7.2.13
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.12 Mon Jun 18 16:46:21 2007
+++ php-src/ext/libxml/libxml.c Sat Jul 21 00:51:17 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.12 2007/06/18 16:46:21 iliaa Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.13 2007/07/21 00:51:17 jani Exp $ */
#define IS_EXT_MODULE
@@ -122,7 +122,7 @@
};
zend_module_entry libxml_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
"libxml", /* extension name */
libxml_functions, /* extension function list */
PHP_MINIT(libxml), /* extension-wide startup function */
@@ -130,11 +130,11 @@
PHP_RINIT(libxml), /* per-request startup function */
PHP_RSHUTDOWN(libxml), /* per-request shutdown function */
PHP_MINFO(libxml), /* information function */
- NO_VERSION_YET,
- PHP_MODULE_GLOBALS(libxml), /* globals descriptor */
- PHP_GINIT(libxml), /* globals ctor */
- NULL, /* globals dtor */
- NULL, /* post deactivate */
+ NO_VERSION_YET,
+ PHP_MODULE_GLOBALS(libxml), /* globals descriptor */
+ PHP_GINIT(libxml), /* globals ctor */
+ NULL, /* globals dtor */
+ NULL, /* post deactivate */
STANDARD_MODULE_PROPERTIES_EX
};
@@ -363,10 +363,10 @@
static xmlParserInputBufferPtr
php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
{
- xmlParserInputBufferPtr ret;
- void *context = NULL;
+ xmlParserInputBufferPtr ret;
+ void *context = NULL;
- if (URI == NULL)
+ if (URI == NULL)
return(NULL);
context = php_libxml_streams_IO_open_read_wrapper(URI);
@@ -392,10 +392,10 @@
xmlCharEncodingHandlerPtr encoder,
int compression ATTRIBUTE_UNUSED)
{
- xmlOutputBufferPtr ret;
- xmlURIPtr puri;
- void *context = NULL;
- char *unescaped = NULL;
+ xmlOutputBufferPtr ret;
+ xmlURIPtr puri;
+ void *context = NULL;
+ char *unescaped = NULL;
if (URI == NULL)
return(NULL);
@@ -432,7 +432,8 @@
return(ret);
}
-static int _php_libxml_free_error(xmlErrorPtr error) {
+static int _php_libxml_free_error(xmlErrorPtr error)
+{
/* This will free the libxml alloc'd memory */
xmlResetError(error);
return 1;
@@ -566,7 +567,8 @@
}
-PHP_LIBXML_API void php_libxml_initialize() {
+PHP_LIBXML_API void php_libxml_initialize(void)
+{
if (!_php_libxml_initialized) {
/* we should be the only one's to ever init!! */
xmlInitParser();
@@ -577,7 +579,8 @@
}
}
-PHP_LIBXML_API void php_libxml_shutdown() {
+PHP_LIBXML_API void php_libxml_shutdown(void)
+{
if (_php_libxml_initialized) {
#if defined(LIBXML_SCHEMAS_ENABLED)
xmlRelaxNGCleanupTypes();
@@ -588,7 +591,8 @@
}
}
-PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC) {
+PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC)
+{
zval *oldcontext;
oldcontext = LIBXML(stream_context);
@@ -643,7 +647,7 @@
xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
xmlOutputBufferCreateFilenameDefault(php_libxml_output_buffer_create_filename);
- return SUCCESS;
+ return SUCCESS;
}
@@ -821,7 +825,7 @@
/* }}} */
/* {{{ proto void libxml_clear_errors()
- Clear last error from libxml */
+ Clear last error from libxml */
static PHP_FUNCTION(libxml_clear_errors)
{
xmlResetLastError();
@@ -866,7 +870,7 @@
php_libxml_initialize();
export_hnd.export_func = export_function;
- return zend_hash_add(&php_libxml_exports, ce->name, ce->name_length + 1,
&export_hnd, sizeof(export_hnd), NULL);
+ return zend_hash_add(&php_libxml_exports, ce->name, ce->name_length +
1, &export_hnd, sizeof(export_hnd), NULL);
}
PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC)
@@ -883,10 +887,8 @@
if (zend_hash_find(&php_libxml_exports, ce->name,
ce->name_length + 1, (void **) &export_hnd) == SUCCESS) {
node = export_hnd->export_func(object TSRMLS_CC);
}
- }
-
+ }
return node;
-
}
int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC)
@@ -921,7 +923,8 @@
return ret_refcount;
}
-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)
+{
int ret_refcount = -1;
php_libxml_node_ptr *obj_node;
@@ -940,7 +943,8 @@
return ret_refcount;
}
-int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC) {
+int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC)
+{
int ret_refcount = -1;
if (object->document != NULL) {
@@ -957,7 +961,8 @@
return ret_refcount;
}
-int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC) {
+int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC)
+{
int ret_refcount = -1;
if (object != NULL && object->document != NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.15.2.2.2.4&r2=1.15.2.2.2.5&diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.15.2.2.2.4
php-src/ext/libxml/php_libxml.h:1.15.2.2.2.5
--- php-src/ext/libxml/php_libxml.h:1.15.2.2.2.4 Mon Jan 1 09:36:02 2007
+++ php-src/ext/libxml/php_libxml.h Sat Jul 21 00:51:17 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_libxml.h,v 1.15.2.2.2.4 2007/01/01 09:36:02 sebastian Exp $ */
+/* $Id: php_libxml.h,v 1.15.2.2.2.5 2007/07/21 00:51:17 jani Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -93,8 +93,8 @@
PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg
TSRMLS_DC);
/* Init/shutdown functions*/
-PHP_LIBXML_API void php_libxml_initialize();
-PHP_LIBXML_API void php_libxml_shutdown();
+PHP_LIBXML_API void php_libxml_initialize(void);
+PHP_LIBXML_API void php_libxml_shutdown(void);
#ifdef ZTS
#define LIBXML(v) TSRMG(libxml_globals_id, zend_libxml_globals *, v)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
