diff options
Diffstat (limited to 'subversion/libsvn_subr/xml.c')
| -rw-r--r-- | subversion/libsvn_subr/xml.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/subversion/libsvn_subr/xml.c b/subversion/libsvn_subr/xml.c index c38dd10..a9d834a 100644 --- a/subversion/libsvn_subr/xml.c +++ b/subversion/libsvn_subr/xml.c @@ -27,6 +27,7 @@ #include <assert.h> #include "svn_private_config.h" /* for SVN_HAVE_OLD_EXPAT */ +#include "svn_hash.h" #include "svn_pools.h" #include "svn_xml.h" #include "svn_error.h" @@ -115,7 +116,7 @@ xml_escape_cdata(svn_stringbuf_t **outstr, const char *p = data, *q; if (*outstr == NULL) - *outstr = svn_stringbuf_create("", pool); + *outstr = svn_stringbuf_create_empty(pool); while (1) { @@ -277,7 +278,7 @@ svn_xml_fuzzy_escape(const char *string, apr_pool_t *pool) if (q == end) return string; - outstr = svn_stringbuf_create("", pool); + outstr = svn_stringbuf_create_empty(pool); while (1) { q = p; @@ -455,7 +456,7 @@ void svn_xml_signal_bailout(svn_error_t *error, /*** Attribute walking. ***/ const char * -svn_xml_get_attr_value(const char *name, const char **atts) +svn_xml_get_attr_value(const char *name, const char *const *atts) { while (atts && (*atts)) { @@ -479,7 +480,7 @@ svn_xml_make_header2(svn_stringbuf_t **str, const char *encoding, { if (*str == NULL) - *str = svn_stringbuf_create("", pool); + *str = svn_stringbuf_create_empty(pool); svn_stringbuf_appendcstr(*str, "<?xml version=\"1.0\""); if (encoding) { @@ -533,7 +534,7 @@ svn_xml_ap_to_hash(va_list ap, apr_pool_t *pool) while ((key = va_arg(ap, char *)) != NULL) { const char *val = va_arg(ap, const char *); - apr_hash_set(ht, key, APR_HASH_KEY_STRING, val); + svn_hash_sets(ht, key, val); } return ht; @@ -646,7 +647,7 @@ void svn_xml_make_close_tag(svn_stringbuf_t **str, const char *tagname) { if (*str == NULL) - *str = svn_stringbuf_create("", pool); + *str = svn_stringbuf_create_empty(pool); svn_stringbuf_appendcstr(*str, "</"); svn_stringbuf_appendcstr(*str, tagname); |