diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/xsl/php_xsl.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/xsl/php_xsl.c')
| -rw-r--r-- | ext/xsl/php_xsl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index b96a07d1ea..94957d4d67 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -80,10 +80,10 @@ void xsl_objects_free_storage(zend_object *object) zend_hash_destroy(intern->parameter); FREE_HASHTABLE(intern->parameter); - + zend_hash_destroy(intern->registered_phpfunctions); FREE_HASHTABLE(intern->registered_phpfunctions); - + if (intern->node_list) { zend_hash_destroy(intern->node_list); FREE_HASHTABLE(intern->node_list); @@ -97,7 +97,7 @@ void xsl_objects_free_storage(zend_object *object) if (intern->ptr) { /* free wrapper */ if (((xsltStylesheetPtr) intern->ptr)->_private != NULL) { - ((xsltStylesheetPtr) intern->ptr)->_private = NULL; + ((xsltStylesheetPtr) intern->ptr)->_private = NULL; } xsltFreeStylesheet((xsltStylesheetPtr) intern->ptr); @@ -130,8 +130,8 @@ zend_object *xsl_objects_new(zend_class_entry *class_type) /* }}} */ PHP_INI_BEGIN() -/* Default is not allowing any write operations. - XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE == 44 +/* Default is not allowing any write operations. + XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE == 44 */ PHP_INI_ENTRY("xsl.security_prefs", "44", PHP_INI_ALL, NULL) PHP_INI_END() @@ -140,9 +140,9 @@ PHP_INI_END() */ PHP_MINIT_FUNCTION(xsl) { - + zend_class_entry ce; - + memcpy(&xsl_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); xsl_object_handlers.offset = XtOffsetOf(xsl_object, std); xsl_object_handlers.clone_obj = NULL; @@ -152,7 +152,7 @@ PHP_MINIT_FUNCTION(xsl) #if HAVE_XSL_EXSLT exsltRegisterAll(); #endif - + xsltRegisterExtModuleFunction ((const xmlChar *) "functionString", (const xmlChar *) "http://php.net/xsl", xsl_ext_function_string_php); @@ -237,7 +237,7 @@ void php_xsl_create_object(xsltStylesheetPtr obj, zval *wrapper_in, zval *return wrapper = wrapper_in; } - + ce = xsl_xsltprocessor_class_entry; if (!wrapper_in) { |