diff options
Diffstat (limited to 'subversion/mod_dav_svn/reports/inherited-props.c')
| -rw-r--r-- | subversion/mod_dav_svn/reports/inherited-props.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/subversion/mod_dav_svn/reports/inherited-props.c b/subversion/mod_dav_svn/reports/inherited-props.c index ce0f4de..bb2300f 100644 --- a/subversion/mod_dav_svn/reports/inherited-props.c +++ b/subversion/mod_dav_svn/reports/inherited-props.c @@ -47,7 +47,7 @@ dav_error * dav_svn__get_inherited_props_report(const dav_resource *resource, const apr_xml_doc *doc, - ap_filter_t *output) + dav_svn__output *output) { svn_error_t *serr; dav_error *derr = NULL; @@ -69,12 +69,10 @@ dav_svn__get_inherited_props_report(const dav_resource *resource, ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE); if (ns == -1) { - return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0, + return dav_svn__new_error_svn(resource->pool, HTTP_BAD_REQUEST, 0, "The request does not contain the 'svn:' " "namespace, so it is not going to have " - "certain required elements.", - SVN_DAV_ERROR_NAMESPACE, - SVN_DAV_ERROR_TAG); + "certain required elements"); } iterpool = svn_pool_create(resource->pool); @@ -107,7 +105,8 @@ dav_svn__get_inherited_props_report(const dav_resource *resource, arb.repos = resource->info->repos; /* Build inherited property brigade */ - bb = apr_brigade_create(resource->pool, output->c->bucket_alloc); + bb = apr_brigade_create(resource->pool, + dav_svn__output_get_bucket_alloc(output)); serr = svn_fs_revision_root(&root, resource->info->repos->fs, rev, resource->pool); @@ -121,7 +120,7 @@ dav_svn__get_inherited_props_report(const dav_resource *resource, &arb, resource->pool, iterpool); if (serr) { - derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message, + derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL, resource->pool); goto cleanup; } @@ -133,7 +132,7 @@ dav_svn__get_inherited_props_report(const dav_resource *resource, "xmlns:D=\"DAV:\">" DEBUG_CR); if (serr) { - derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message, + derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL, resource->pool); goto cleanup; } @@ -161,8 +160,8 @@ dav_svn__get_inherited_props_report(const dav_resource *resource, hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + svn_string_t *propval = apr_hash_this_val(hi); const char *xml_safe; serr = dav_svn__brigade_printf( |