diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 12:55:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 12:55:03 +0200 |
| commit | 168ea67b2d8f44ec29b6aa725ad768d190ddd0d8 (patch) | |
| tree | 3c79a8d23221e681fdb701862f0a44a0ab80d7a4 /ext/xsl/xsltprocessor.c | |
| parent | acdda1093bfc21af1a710977a6f8eabc8b0bdbf1 (diff) | |
| download | php-git-168ea67b2d8f44ec29b6aa725ad768d190ddd0d8.tar.gz | |
ported xsl, xml reader and writer
Diffstat (limited to 'ext/xsl/xsltprocessor.c')
| -rw-r--r-- | ext/xsl/xsltprocessor.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index 93abf8d379..2bb5010a00 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -138,7 +138,7 @@ static char **php_xsl_xslt_make_params(HashTable *parht, int xpath_params TSRMLS zval *value; char *xpath_expr; zend_string *string_key; - ulong num_key; + php_uint_t num_key; char **params = NULL; int i = 0; @@ -292,7 +292,11 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t fci.size = sizeof(fci); fci.function_table = EG(function_table); - fci.params = args; + if (fci.param_count > 0) { + fci.params = args; + } else { + fci.params = NULL; + } obj = valuePop(ctxt); if (obj->stringval == NULL) { @@ -760,7 +764,7 @@ PHP_FUNCTION(xsl_xsltprocessor_set_parameter) zval *id; zval *array_value, *entry, new_string; xsl_object *intern; - ulong idx; + php_uint_t idx; char *namespace; int namespace_len; zend_string *string_key, *name, *value; @@ -914,10 +918,10 @@ PHP_FUNCTION(xsl_xsltprocessor_set_security_prefs) { zval *id; xsl_object *intern; - long securityPrefs, oldSecurityPrefs; + php_int_t securityPrefs, oldSecurityPrefs; DOM_GET_THIS(id); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &securityPrefs) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &securityPrefs) == FAILURE) { return; } intern = Z_XSL_P(id); |