pajoye Wed Dec 21 00:37:49 2005 EDT
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
- update inline docs
- fix {{{ }}}
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.23
php-src/ext/xmlreader/php_xmlreader.c:1.24
--- php-src/ext/xmlreader/php_xmlreader.c:1.23 Tue Dec 20 14:13:11 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Wed Dec 21 00:37:49 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.23 2005/12/20 14:13:11 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.24 2005/12/21 00:37:49 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -54,7 +54,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_const_char_t
read_char_func, int rettype TSRMLS_DC)
{
xmlreader_prop_handler hnd;
@@ -64,7 +64,8 @@
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)
{
const xmlChar *retchar = NULL;
@@ -106,6 +107,7 @@
return SUCCESS;
}
+/* }}} */
/* {{{ xmlreader_read_property */
zval *xmlreader_read_property(zval *object, zval *member, int type TSRMLS_DC)
@@ -185,6 +187,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) {
@@ -232,7 +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
#if ZEND_MODULE_API_NO >= 20050922
@@ -315,6 +322,7 @@
}
/* }}} */
+/* {{{ xmlreader_free_resources */
static void xmlreader_free_resources(xmlreader_object *intern) {
if (intern) {
if (intern->ptr) {
@@ -329,6 +337,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,7 +428,9 @@
RETURN_FALSE;
}
+/* }}} */
+/* {{{ php_xmlreader_no_arg_string */
static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS,
xmlreader_read_char_t internal_function) {
zval *id;
char *retchar = NULL;
@@ -436,7 +450,9 @@
RETVAL_EMPTY_STRING();
}
}
+/* }}} */
+/* {{{ php_xmlreader_set_relaxng_schema */
static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int
type) {
#ifdef LIBXML_SCHEMAS_ENABLED
zval *id;
@@ -488,6 +504,7 @@
RETURN_FALSE;
#endif
}
+/* }}} */
/* {{{ proto boolean XMLReader::close()
Closes xmlreader - current frees resources until xmlTextReaderClose is fixed
in libxml */
@@ -505,6 +522,7 @@
RETURN_TRUE;
}
+/* }}} */
/* {{{ proto string XMLReader::getAttribute(string name)
Get value of an attribute from current element */
@@ -872,20 +890,29 @@
*/
#if LIBXML_VERSION >= 20620
+/* {{{ proto boolean XMLReader::readInnerXml()
+Reads the contents of the current node, including child nodes and markup. */
PHP_METHOD(xmlreader, readInnerXml)
{
php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextReaderReadInnerXml);
}
+/* }}} */
+/* {{{ proto boolean XMLReader::readOuterXml()
+Reads the contents of the current node, including child nodes and markup. */
PHP_METHOD(xmlreader, readOuterXml)
{
php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextReaderReadOuterXml);
}
+/* }}} */
+/* {{{ proto boolean XMLReader::readString()
+Reads the contents of an element or a text node as a string. */
PHP_METHOD(xmlreader, readString)
{
php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextReaderReadString);
}
+/* }}} */
#endif
/* {{{ proto boolean XMLReader::setParserProperty(int property, boolean value)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
