summaryrefslogtreecommitdiff
path: root/ext/dom
diff options
context:
space:
mode:
Diffstat (limited to 'ext/dom')
-rw-r--r--ext/dom/characterdata.c6
-rw-r--r--ext/dom/document.c44
-rw-r--r--ext/dom/element.c28
3 files changed, 48 insertions, 30 deletions
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index ab407f2caa..45306dde68 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -240,7 +240,8 @@ PHP_FUNCTION(dom_characterdata_insert_data)
xmlNodePtr node;
char *arg;
zend_long offset;
- int length, arg_len;
+ int length;
+ size_t arg_len;
dom_object *intern;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) {
@@ -343,7 +344,8 @@ PHP_FUNCTION(dom_characterdata_replace_data)
xmlNodePtr node;
char *arg;
zend_long offset, count;
- int length, arg_len;
+ int length;
+ size_t arg_len;
dom_object *intern;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) {
diff --git a/ext/dom/document.c b/ext/dom/document.c
index f305d58e30..9fa1dce9cb 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -786,7 +786,8 @@ PHP_FUNCTION(dom_document_create_comment)
zval *id;
xmlNode *node;
xmlDocPtr docp;
- int ret, value_len;
+ int ret;
+ size_t value_len;
dom_object *intern;
char *value;
@@ -814,7 +815,8 @@ PHP_FUNCTION(dom_document_create_cdatasection)
zval *id;
xmlNode *node;
xmlDocPtr docp;
- int ret, value_len;
+ int ret;
+ size_t value_len;
dom_object *intern;
char *value;
@@ -842,7 +844,8 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
zval *id;
xmlNode *node;
xmlDocPtr docp;
- int ret, value_len, name_len = 0;
+ int ret;
+ size_t value_len, name_len = 0;
dom_object *intern;
char *name, *value = NULL;
@@ -877,7 +880,8 @@ PHP_FUNCTION(dom_document_create_attribute)
zval *id;
xmlAttrPtr node;
xmlDocPtr docp;
- int ret, name_len;
+ int ret;
+ size_t name_len;
dom_object *intern;
char *name;
@@ -912,7 +916,8 @@ PHP_FUNCTION(dom_document_create_entity_reference)
xmlNode *node;
xmlDocPtr docp = NULL;
dom_object *intern;
- int ret, name_len;
+ int ret;
+ size_t name_len;
char *name;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) {
@@ -1026,7 +1031,8 @@ PHP_FUNCTION(dom_document_create_element_ns)
xmlDocPtr docp;
xmlNodePtr nodep = NULL;
xmlNsPtr nsptr = NULL;
- int ret, uri_len = 0, name_len = 0, value_len = 0;
+ int ret;
+ size_t uri_len = 0, name_len = 0, value_len = 0;
char *uri, *name, *value = NULL;
char *localname = NULL, *prefix = NULL;
int errorcode;
@@ -1089,7 +1095,8 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
xmlDocPtr docp;
xmlNodePtr nodep = NULL, root;
xmlNsPtr nsptr;
- int ret, uri_len = 0, name_len = 0;
+ int ret;
+ size_t uri_len = 0, name_len = 0;
char *uri, *name;
char *localname = NULL, *prefix = NULL;
dom_object *intern;
@@ -1180,7 +1187,8 @@ PHP_FUNCTION(dom_document_get_element_by_id)
zval *id;
xmlDocPtr docp;
xmlAttrPtr attrp;
- int ret, idname_len;
+ int ret;
+ size_t idname_len;
dom_object *intern;
char *idname;
@@ -1249,7 +1257,8 @@ PHP_METHOD(domdocument, __construct)
xmlDoc *docp = NULL, *olddoc;
dom_object *intern;
char *encoding, *version = NULL;
- size_t encoding_len = 0, version_len = 0, refcount;
+ size_t encoding_len = 0, version_len = 0;
+ int refcount;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
@@ -1466,7 +1475,8 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
dom_doc_propsptr doc_prop;
dom_object *intern;
char *source;
- int source_len, refcount, ret;
+ size_t source_len;
+ int refcount, ret;
zend_long options = 0;
id = getThis();
@@ -1545,7 +1555,8 @@ PHP_FUNCTION(dom_document_save)
{
zval *id;
xmlDoc *docp;
- size_t file_len = 0, bytes, format, saveempty = 0;
+ size_t file_len = 0;
+ int bytes, format, saveempty = 0;
dom_object *intern;
dom_doc_propsptr doc_props;
char *file;
@@ -1773,7 +1784,8 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
xmlDoc *docp;
dom_object *intern;
char *source = NULL, *valid_file = NULL;
- int source_len = 0, valid_opts = 0;
+ size_t source_len = 0;
+ int valid_opts = 0;
zend_long flags = 0;
xmlSchemaParserCtxtPtr parser;
xmlSchemaPtr sptr;
@@ -1870,7 +1882,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
xmlDoc *docp;
dom_object *intern;
char *source = NULL, *valid_file = NULL;
- int source_len = 0;
+ size_t source_len = 0;
xmlRelaxNGParserCtxtPtr parser;
xmlRelaxNGPtr sptr;
xmlRelaxNGValidCtxtPtr vptr;
@@ -1964,7 +1976,8 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
dom_object *intern;
dom_doc_propsptr doc_prop;
char *source;
- int source_len, refcount, ret;
+ size_t source_len;
+ int refcount, ret;
zend_long options = 0;
htmlParserCtxtPtr ctxt;
@@ -2062,7 +2075,8 @@ PHP_FUNCTION(dom_document_save_html_file)
{
zval *id;
xmlDoc *docp;
- int file_len, bytes, format;
+ size_t file_len;
+ int bytes, format;
dom_object *intern;
dom_doc_propsptr doc_props;
char *file;
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 47ba6a31e0..b2b8b10fad 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -159,8 +159,8 @@ PHP_METHOD(domelement, __construct)
dom_object *intern;
char *name, *value = NULL, *uri = NULL;
char *localname = NULL, *prefix = NULL;
- int errorcode = 0, uri_len = 0;
- size_t name_len, value_len = 0;
+ int errorcode = 0;
+ size_t name_len, value_len = 0, uri_len = 0;
int name_valid;
xmlNsPtr nsptr = NULL;
zend_error_handling error_handling;
@@ -331,7 +331,7 @@ PHP_FUNCTION(dom_element_get_attribute)
xmlChar *value = NULL;
dom_object *intern;
xmlNodePtr attr;
- int name_len;
+ size_t name_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
return;
@@ -438,7 +438,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
zval *id;
xmlNodePtr nodep, attrp;
dom_object *intern;
- int name_len;
+ size_t name_len;
char *name;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
@@ -485,7 +485,8 @@ PHP_FUNCTION(dom_element_get_attribute_node)
{
zval *id;
xmlNodePtr nodep, attrp;
- int name_len, ret;
+ size_t name_len;
+ int ret;
dom_object *intern;
char *name;
@@ -634,7 +635,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
{
zval *id;
xmlNodePtr elemp;
- int name_len;
+ size_t name_len;
dom_object *intern, *namednode;
char *name;
xmlChar *local;
@@ -871,7 +872,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
xmlAttr *attrp;
xmlNsPtr nsptr;
dom_object *intern;
- int name_len, uri_len;
+ size_t name_len, uri_len;
char *name, *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) {
@@ -927,7 +928,8 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns)
xmlNodePtr elemp;
xmlAttrPtr attrp;
dom_object *intern;
- int uri_len, name_len, ret;
+ size_t uri_len, name_len;
+ int ret;
char *uri, *name;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) {
@@ -1028,7 +1030,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns)
{
zval *id;
xmlNodePtr elemp;
- int uri_len, name_len;
+ size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;
xmlChar *local, *nsuri;
@@ -1058,7 +1060,7 @@ PHP_FUNCTION(dom_element_has_attribute)
xmlNode *nodep;
dom_object *intern;
char *name;
- int name_len;
+ size_t name_len;
xmlNodePtr attr;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
@@ -1086,7 +1088,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns)
xmlNodePtr elemp;
xmlNs *nsp;
dom_object *intern;
- int uri_len, name_len;
+ size_t uri_len, name_len;
char *uri, *name;
xmlChar *value;
@@ -1144,7 +1146,7 @@ PHP_FUNCTION(dom_element_set_id_attribute)
xmlAttrPtr attrp;
dom_object *intern;
char *name;
- int name_len;
+ size_t name_len;
zend_bool is_id;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) {
@@ -1179,7 +1181,7 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns)
xmlNodePtr elemp;
xmlAttrPtr attrp;
dom_object *intern;
- int uri_len, name_len;
+ size_t uri_len, name_len;
char *uri, *name;
zend_bool is_id;
View Lorry Controller Status