diff options
Diffstat (limited to 'subversion/mod_dav_svn/reports/deleted-rev.c')
| -rw-r--r-- | subversion/mod_dav_svn/reports/deleted-rev.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/subversion/mod_dav_svn/reports/deleted-rev.c b/subversion/mod_dav_svn/reports/deleted-rev.c index 66d0192..a21aaec 100644 --- a/subversion/mod_dav_svn/reports/deleted-rev.c +++ b/subversion/mod_dav_svn/reports/deleted-rev.c @@ -41,7 +41,7 @@ dav_error * dav_svn__get_deleted_rev_report(const dav_resource *resource, const apr_xml_doc *doc, - ap_filter_t *output) + dav_svn__output *output) { apr_xml_elem *child; int ns; @@ -52,7 +52,6 @@ dav_svn__get_deleted_rev_report(const dav_resource *resource, svn_revnum_t deleted_rev; apr_bucket_brigade *bb; svn_error_t *err; - apr_status_t apr_err; dav_error *derr = NULL; /* Sanity check. */ @@ -61,12 +60,10 @@ dav_svn__get_deleted_rev_report(const dav_resource *resource, "The request does not specify a repository path"); 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) { @@ -104,10 +101,8 @@ dav_svn__get_deleted_rev_report(const dav_resource *resource, && SVN_IS_VALID_REVNUM(peg_rev) && SVN_IS_VALID_REVNUM(end_rev))) { - return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0, - "Not all parameters passed.", - SVN_DAV_ERROR_NAMESPACE, - SVN_DAV_ERROR_TAG); + return dav_svn__new_error_svn(resource->pool, HTTP_BAD_REQUEST, 0, + "Not all parameters passed"); } /* Do what we actually came here for: Find the rev abs_path was deleted. */ @@ -121,16 +116,17 @@ dav_svn__get_deleted_rev_report(const dav_resource *resource, "Could not find revision path was deleted."); } - bb = apr_brigade_create(resource->pool, output->c->bucket_alloc); - apr_err = ap_fprintf(output, bb, + bb = apr_brigade_create(resource->pool, + dav_svn__output_get_bucket_alloc(output)); + err = dav_svn__brigade_printf(bb, output, DAV_XML_HEADER DEBUG_CR "<S:get-deleted-rev-report xmlns:S=\"" SVN_XML_NAMESPACE "\" xmlns:D=\"DAV:\">" DEBUG_CR "<D:" SVN_DAV__VERSION_NAME ">%ld</D:" SVN_DAV__VERSION_NAME ">""</S:get-deleted-rev-report>", deleted_rev); - if (apr_err) - derr = dav_svn__convert_err(svn_error_create(apr_err, 0, NULL), + if (err) + derr = dav_svn__convert_err(err, HTTP_INTERNAL_SERVER_ERROR, "Error writing REPORT response.", resource->pool); |