MFH: cs+ws+compile warning fixes

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 52d7bba45d2f29b4cad704ad45c54252957be32c..91adeaddea09cd802c1319159bf1c1d0cd8a2cf7 100644 (file)
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -122,7 +122,7 @@ static zend_function_entry libxml_functions[] = {
 };
 
 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 @@ zend_module_entry libxml_module_entry = {
        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 int php_libxml_streams_IO_close(void *context)
 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 @@ php_libxml_output_buffer_create_filename(const char *URI,
                               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 @@ php_libxml_output_buffer_create_filename(const char *URI,
        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_error_handler(void *ctx, const char *msg, ...)
 }
 
 
-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_initialize() {
        }
 }
 
-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 void php_libxml_shutdown() {
        }
 }
 
-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 @@ static PHP_RINIT_FUNCTION(libxml)
        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 @@ static PHP_FUNCTION(libxml_get_errors)
 /* }}} */
 
 /* {{{ 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 @@ int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node expo
        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 @@ PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC)
                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 @@ int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr nod
        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 @@ int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC) {
        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 @@ int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr docp
        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) {

diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index 9240fc922a4ba34132063eeb86a7456990e02595..c3f6b5675ec57fd8e7b9f8c27ba93b07d6904623 100644 (file)
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -93,8 +93,8 @@ PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC);
 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)