summaryrefslogtreecommitdiff
path: root/ext/dom
diff options
context:
space:
mode:
Diffstat (limited to 'ext/dom')
-rw-r--r--ext/dom/attr.c2
-rw-r--r--ext/dom/cdatasection.c2
-rw-r--r--ext/dom/characterdata.c2
-rw-r--r--ext/dom/comment.c2
-rw-r--r--ext/dom/document.c16
-rw-r--r--ext/dom/documentfragment.c2
-rw-r--r--ext/dom/domimplementation.c8
-rw-r--r--ext/dom/element.c10
-rw-r--r--ext/dom/entityreference.c2
-rw-r--r--ext/dom/namednodemap.c6
-rw-r--r--ext/dom/node.c11
-rw-r--r--ext/dom/processinginstruction.c3
-rw-r--r--ext/dom/text.c2
-rw-r--r--ext/dom/xpath.c4
14 files changed, 41 insertions, 31 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 4cd4414691..61e1f9675e 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -60,7 +60,7 @@ PHP_METHOD(domattr, __construct)
xmlNodePtr oldnode = NULL;
dom_object *intern;
char *name, *value = NULL;
- int name_len, value_len, name_valid;
+ size_t name_len, value_len, name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index a2f0589464..a126cec573 100644
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@@ -54,7 +54,7 @@ PHP_METHOD(domcdatasection, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
- int value_len;
+ size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index ccae33ab74..ab407f2caa 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
xmlNode *nodep;
dom_object *intern;
char *arg;
- int arg_len;
+ size_t arg_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) {
return;
diff --git a/ext/dom/comment.c b/ext/dom/comment.c
index 0670337651..050c3abf70 100644
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@@ -54,7 +54,7 @@ PHP_METHOD(domcomment, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
- int value_len;
+ size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 944d55c20b..f305d58e30 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -697,7 +697,8 @@ PHP_FUNCTION(dom_document_create_element)
xmlNode *node;
xmlDocPtr docp;
dom_object *intern;
- int ret, name_len, value_len;
+ int ret;
+ size_t name_len, value_len;
char *name, *value = NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) {
@@ -756,7 +757,8 @@ PHP_FUNCTION(dom_document_create_text_node)
zval *id;
xmlNode *node;
xmlDocPtr docp;
- int ret, value_len;
+ int ret;
+ size_t value_len;
dom_object *intern;
char *value;
@@ -941,7 +943,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
{
zval *id;
xmlDocPtr docp;
- int name_len;
+ size_t name_len;
dom_object *intern, *namednode;
char *name;
xmlChar *local;
@@ -1150,7 +1152,7 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
{
zval *id;
xmlDocPtr docp;
- int uri_len, name_len;
+ size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;
xmlChar *local, *nsuri;
@@ -1247,7 +1249,7 @@ PHP_METHOD(domdocument, __construct)
xmlDoc *docp = NULL, *olddoc;
dom_object *intern;
char *encoding, *version = NULL;
- int encoding_len = 0, version_len = 0, refcount;
+ size_t encoding_len = 0, version_len = 0, refcount;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
@@ -1341,7 +1343,7 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p
}
/* }}} */
-static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int source_len, int options TSRMLS_DC) /* {{{ */
+static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t source_len, size_t options TSRMLS_DC) /* {{{ */
{
xmlDocPtr ret;
xmlParserCtxtPtr ctxt = NULL;
@@ -1543,7 +1545,7 @@ PHP_FUNCTION(dom_document_save)
{
zval *id;
xmlDoc *docp;
- int file_len = 0, bytes, format, saveempty = 0;
+ size_t file_len = 0, bytes, format, saveempty = 0;
dom_object *intern;
dom_doc_propsptr doc_props;
char *file;
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c
index f20ada3db4..a93b30620c 100644
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -122,7 +122,7 @@ PHP_METHOD(domdocumentfragment, appendXML) {
xmlNode *nodep;
dom_object *intern;
char *data = NULL;
- int data_len = 0;
+ size_t data_len = 0;
int err;
xmlNodePtr lst;
diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index 8cdd0fe28b..8614c8b1d9 100644
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -70,7 +70,7 @@ Since:
*/
PHP_METHOD(domimplementation, hasFeature)
{
- int feature_len, version_len;
+ size_t feature_len, version_len;
char *feature, *version;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &feature, &feature_len, &version, &version_len) == FAILURE) {
@@ -92,7 +92,8 @@ Since: DOM Level 2
PHP_METHOD(domimplementation, createDocumentType)
{
xmlDtd *doctype;
- int ret, name_len = 0, publicid_len = 0, systemid_len = 0;
+ int ret;
+ size_t name_len = 0, publicid_len = 0, systemid_len = 0;
char *name = NULL, *publicid = NULL, *systemid = NULL;
xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL;
xmlURIPtr uri;
@@ -155,7 +156,8 @@ PHP_METHOD(domimplementation, createDocument)
xmlNode *nodep;
xmlDtdPtr doctype = NULL;
xmlNsPtr nsptr = NULL;
- int ret, uri_len = 0, name_len = 0, errorcode = 0;
+ int ret, errorcode = 0;
+ size_t uri_len = 0, name_len = 0;
char *uri = NULL, *name = NULL;
char *prefix = NULL, *localname = NULL;
dom_object *doctobj;
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 5ecf031c4c..47ba6a31e0 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -160,7 +160,8 @@ PHP_METHOD(domelement, __construct)
char *name, *value = NULL, *uri = NULL;
char *localname = NULL, *prefix = NULL;
int errorcode = 0, uri_len = 0;
- int name_len, value_len = 0, name_valid;
+ size_t name_len, value_len = 0;
+ int name_valid;
xmlNsPtr nsptr = NULL;
zend_error_handling error_handling;
@@ -370,7 +371,8 @@ PHP_FUNCTION(dom_element_set_attribute)
zval *id;
xmlNode *nodep;
xmlNodePtr attr = NULL;
- int ret, name_len, value_len, name_valid;
+ int ret, name_valid;
+ size_t name_len, value_len;
dom_object *intern;
char *name, *value;
@@ -660,7 +662,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
xmlNodePtr elemp;
xmlNsPtr nsptr;
dom_object *intern;
- int uri_len = 0, name_len = 0;
+ size_t uri_len = 0, name_len = 0;
char *uri, *name;
xmlChar *strattr;
@@ -740,7 +742,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
xmlNodePtr elemp, nodep = NULL;
xmlNsPtr nsptr;
xmlAttr *attr;
- int uri_len = 0, name_len = 0, value_len = 0;
+ size_t uri_len = 0, name_len = 0, value_len = 0;
char *uri, *name, *value;
char *localname = NULL, *prefix = NULL;
dom_object *intern;
diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c
index bc03385116..c9e7500719 100644
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@@ -53,7 +53,7 @@ PHP_METHOD(domentityreference, __construct)
xmlNodePtr oldnode = NULL;
dom_object *intern;
char *name;
- int name_len, name_valid;
+ size_t name_len, name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c
index bae0b28ec2..39eab7ccdb 100644
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@@ -126,7 +126,8 @@ Since:
PHP_FUNCTION(dom_namednodemap_get_named_item)
{
zval *id;
- int ret, namedlen=0;
+ int ret;
+ size_t namedlen=0;
dom_object *intern;
xmlNodePtr itemnode = NULL;
char *named;
@@ -258,7 +259,8 @@ Since: DOM Level 2
PHP_FUNCTION(dom_namednodemap_get_named_item_ns)
{
zval *id;
- int ret, namedlen=0, urilen=0;
+ int ret;
+ size_t namedlen=0, urilen=0;
dom_object *intern;
xmlNodePtr itemnode = NULL;
char *uri, *named;
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 32880ee7d9..6821348e07 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -1413,7 +1413,7 @@ Since: DOM Level 2
PHP_FUNCTION(dom_node_is_supported)
{
zval *id;
- int feature_len, version_len;
+ size_t feature_len, version_len;
char *feature, *version;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) {
@@ -1501,7 +1501,7 @@ PHP_FUNCTION(dom_node_lookup_prefix)
xmlNodePtr nodep, lookupp = NULL;
dom_object *intern;
xmlNsPtr nsptr;
- int uri_len = 0;
+ size_t uri_len = 0;
char *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) {
@@ -1551,7 +1551,7 @@ PHP_FUNCTION(dom_node_is_default_namespace)
xmlNodePtr nodep;
dom_object *intern;
xmlNsPtr nsptr;
- int uri_len = 0;
+ size_t uri_len = 0;
char *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) {
@@ -1584,7 +1584,7 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri)
xmlNodePtr nodep;
dom_object *intern;
xmlNsPtr nsptr;
- int prefix_len = 0;
+ size_t prefix_len = 0;
char *prefix=NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) {
@@ -1659,7 +1659,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
zend_bool exclusive=0, with_comments=0;
xmlChar **inclusive_ns_prefixes = NULL;
char *file = NULL;
- int ret = -1, file_len = 0;
+ int ret = -1;
+ size_t file_len = 0;
xmlOutputBufferPtr buf;
xmlXPathContextPtr ctxp=NULL;
xmlXPathObjectPtr xpathobjp=NULL;
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index c46b1bf244..78929214ec 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -54,7 +54,8 @@ PHP_METHOD(domprocessinginstruction, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *name, *value = NULL;
- int name_len, value_len, name_valid;
+ size_t name_len, value_len;
+ int name_valid;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/text.c b/ext/dom/text.c
index 9940dbf8d0..2cbb1c7da3 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -69,7 +69,7 @@ PHP_METHOD(domtext, __construct)
xmlNodePtr nodep = NULL, oldnode = NULL;
dom_object *intern;
char *value = NULL;
- int value_len;
+ size_t value_len;
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 549411d768..7a7f7a81e1 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -319,7 +319,7 @@ PHP_FUNCTION(dom_xpath_register_ns)
{
zval *id;
xmlXPathContextPtr ctxp;
- int prefix_len, ns_uri_len;
+ size_t prefix_len, ns_uri_len;
dom_xpath_object *intern;
unsigned char *prefix, *ns_uri;
@@ -357,7 +357,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
xmlXPathContextPtr ctxp;
xmlNodePtr nodep = NULL;
xmlXPathObjectPtr xpathobjp;
- int expr_len, nsnbr = 0, xpath_type;
+ size_t expr_len, nsnbr = 0, xpath_type;
dom_xpath_object *intern;
dom_object *nodeobj;
char *expr;
View Lorry Controller Status