pajoye Wed Dec 21 01:12:24 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/xmlreader php_xmlreader.c
Log:
- fix {{{
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.5&r2=1.13.2.6&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.5
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.6
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.5 Sun Dec 18 21:17:07 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Wed Dec 21 01:12:24 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.5 2005/12/18 21:17:07 tony2001 Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.6 2005/12/21 01:12:24 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -53,7 +53,7 @@
#define XMLREADER_LOAD_STRING 0
#define XMLREADER_LOAD_FILE 1
-
+/* {{{ xmlreader_register_prop_handler */
static void xmlreader_register_prop_handler(HashTable *prop_handler, char
*name, xmlreader_read_int_t read_int_func, xmlreader_read_char_t
read_char_func, int rettype TSRMLS_DC)
{
xmlreader_prop_handler hnd;
@@ -63,7 +63,9 @@
hnd.type = rettype;
zend_hash_add(prop_handler, name, strlen(name)+1, &hnd,
sizeof(xmlreader_prop_handler), NULL);
}
+/* }}} */
+/* {{{ xmlreader_property_reader */
static int xmlreader_property_reader(xmlreader_object *obj,
xmlreader_prop_handler *hnd, zval **retval TSRMLS_DC)
{
char *retchar = NULL;
@@ -106,6 +108,7 @@
return SUCCESS;
}
+/* }}} */
/* {{{ xmlreader_read_property */
zval *xmlreader_read_property(zval *object, zval *member, int type TSRMLS_DC)
@@ -185,6 +188,7 @@
}
/* }}} */
+/* {{{ _xmlreader_get_valid_file_path */
/* _xmlreader_get_valid_file_path and _xmlreader_get_relaxNG should be made a
common function in libxml extension as code is common to a few xml
extensions */
char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int
resolved_path_len TSRMLS_DC) {
@@ -231,8 +235,10 @@
return file_dest;
}
+/* }}} */
#ifdef LIBXML_SCHEMAS_ENABLED
+/* {{{ _xmlreader_get_relaxNG */
static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int
type,
xmlRelaxNGValidityErrorFunc error_func,
xmlRelaxNGValidityWarningFunc warn_func TSRMLS_DC)
@@ -274,6 +280,7 @@
return sptr;
}
+/* }}} */
#endif
static zend_module_dep xmlreader_deps[] = {
@@ -309,6 +316,7 @@
}
/* }}} */
+/* {{{ xmlreader_free_resources */
static void xmlreader_free_resources(xmlreader_object *intern) {
if (intern) {
if (intern->input) {
@@ -328,6 +336,7 @@
#endif
}
}
+/* }}} */
/* {{{ xmlreader_objects_free_storage */
void xmlreader_objects_free_storage(void *object TSRMLS_DC)
@@ -368,6 +377,7 @@
}
/* }}} */
+/* {{{ php_xmlreader_string_arg */
static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS,
xmlreader_read_one_char_t internal_function) {
zval *id;
int name_len = 0;
@@ -398,7 +408,9 @@
RETVAL_EMPTY_STRING();
}
}
+/* }}} */
+/* {{{ php_xmlreader_no_arg */
static void php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAMETERS,
xmlreader_read_int_t internal_function) {
zval *id;
int retval;
@@ -416,6 +428,7 @@
RETURN_FALSE;
}
+/* }}} */
/* This function not yet needed until some additional functions are
implemented in libxml
static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS,
xmlreader_read_char_t internal_function) {
@@ -439,6 +452,7 @@
}
*/
+/* {{{ php_xmlreader_set_relaxng_schema */
static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int
type) {
#ifdef LIBXML_SCHEMAS_ENABLED
zval *id;
@@ -490,6 +504,7 @@
RETURN_FALSE;
#endif
}
+/* }}} */
/* {{{ proto boolean XMLReader::close()
Closes xmlreader - current frees resources until xmlTextReaderClose is fixed
in libxml */
@@ -507,6 +522,7 @@
RETURN_TRUE;
}
+/* }}} */
/* {{{ proto string XMLReader::getAttribute(string name)
Get value of an attribute from current element */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
