diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-15 15:40:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-15 15:40:40 +0400 |
| commit | 050d7e38ad4163e7fa65e26724d3516ce7b33601 (patch) | |
| tree | 2bb49b1b73c37b35fc778e83d9353f0eb9cc12a3 /ext/libxml/libxml.c | |
| parent | 93d3a613d82d32dd6f5499e211bfe194d60898b0 (diff) | |
| download | php-git-050d7e38ad4163e7fa65e26724d3516ce7b33601.tar.gz | |
Cleanup (1-st round)
Diffstat (limited to 'ext/libxml/libxml.c')
| -rw-r--r-- | ext/libxml/libxml.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index c8eda85417..b0974b4020 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -589,7 +589,7 @@ static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL, add_assoc_null_ex(ctxzv, #memb, sizeof(#memb) - 1); \ } else { \ add_assoc_string_ex(ctxzv, #memb, sizeof(#memb - 1), \ - (char *)context->memb, 1); \ + (char *)context->memb); \ } ADD_NULL_OR_STRING_KEY(directory) @@ -982,14 +982,14 @@ static PHP_FUNCTION(libxml_get_last_error) add_property_long(return_value, "code", error->code); add_property_long(return_value, "column", error->int2); if (error->message) { - add_property_string(return_value, "message", error->message, 1); + add_property_string(return_value, "message", error->message); } else { - add_property_stringl(return_value, "message", "", 0, 1); + add_property_stringl(return_value, "message", "", 0); } if (error->file) { - add_property_string(return_value, "file", error->file, 1); + add_property_string(return_value, "file", error->file); } else { - add_property_stringl(return_value, "file", "", 0, 1); + add_property_stringl(return_value, "file", "", 0); } add_property_long(return_value, "line", error->line); } else { @@ -1021,14 +1021,14 @@ static PHP_FUNCTION(libxml_get_errors) add_property_long(&z_error, "code", error->code); add_property_long(&z_error, "column", error->int2); if (error->message) { - add_property_string(&z_error, "message", error->message, 1); + add_property_string(&z_error, "message", error->message); } else { - add_property_stringl(&z_error, "message", "", 0, 1); + add_property_stringl(&z_error, "message", "", 0); } if (error->file) { - add_property_string(&z_error, "file", error->file, 1); + add_property_string(&z_error, "file", error->file); } else { - add_property_stringl(&z_error, "file", "", 0, 1); + add_property_stringl(&z_error, "file", "", 0); } add_property_long(&z_error, "line", error->line); add_next_index_zval(return_value, &z_error); |