archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- ws + compile warning fixes

Browse source
This commit is contained in:
Jani Taskinen 2007-07-21 00:49:53 +00:00
parent 5d0176a32b
commit 7e9e8c950f
2 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/libxml/libxml.c
View file

@ -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);
@ -922,7 +926,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;
@ -941,7 +946,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) {
@ -960,7 +966,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) {

4
ext/libxml/php_libxml.h
View file

@ -96,8 +96,8 @@ PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC)
PHP_LIBXML_API char* php_libxml_unicode_to_string(UChar *ustr, int ustr_len, int *str_len 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);
#define ZVAL_XML_STRING(z, s, flags) { \
UConverter *libxml_utf_conv = NULL; \