diff options
Diffstat (limited to 'subversion/mod_dav_svn/reports/mergeinfo.c')
| -rw-r--r-- | subversion/mod_dav_svn/reports/mergeinfo.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/subversion/mod_dav_svn/reports/mergeinfo.c b/subversion/mod_dav_svn/reports/mergeinfo.c index 15c3071..107c7a1 100644 --- a/subversion/mod_dav_svn/reports/mergeinfo.c +++ b/subversion/mod_dav_svn/reports/mergeinfo.c @@ -46,7 +46,7 @@ dav_error * dav_svn__get_mergeinfo_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; @@ -73,12 +73,10 @@ dav_svn__get_mergeinfo_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"); } for (child = doc->root->first_child; child != NULL; child = child->next) @@ -126,7 +124,8 @@ dav_svn__get_mergeinfo_report(const dav_resource *resource, arb.repos = resource->info->repos; /* Build mergeinfo 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_repos_fs_get_mergeinfo(&catalog, repos->repos, paths, rev, inherit, include_descendants, @@ -134,7 +133,7 @@ dav_svn__get_mergeinfo_report(const dav_resource *resource, &arb, resource->pool); 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; } @@ -144,7 +143,7 @@ dav_svn__get_mergeinfo_report(const dav_resource *resource, resource->pool); 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; } @@ -162,7 +161,7 @@ dav_svn__get_mergeinfo_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; } |