You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/07/02 15:42:16 UTC
svn commit: r1498938 - in /subversion/trunk/subversion:
include/svn_error_codes.h libsvn_ra_serf/xml.c
Author: rhuijben
Date: Tue Jul 2 13:42:16 2013
New Revision: 1498938
URL: http://svn.apache.org/r1498938
Log:
Following up on r1498851, add new error code for encountering an unexpected xml
element.
* subversion/include/svn_error_codes.h
(SVN_ERR_XML_UNEXPECTED_ELEMENT): New error.
* subversion/libsvn_ra_serf/xml.c
(svn_ra_serf__xml_cb_start): Return a SVN_ERR_XML_UNEXPECTED_ELEMENT error
when the document element is not recognized.
Modified:
subversion/trunk/subversion/include/svn_error_codes.h
subversion/trunk/subversion/libsvn_ra_serf/xml.c
Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1498938&r1=1498937&r2=1498938&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Tue Jul 2 13:42:16 2013
@@ -255,6 +255,11 @@ SVN_ERROR_START
SVN_ERR_XML_CATEGORY_START + 4,
"Data cannot be safely XML-escaped")
+ /** @since New in 1.9. */
+ SVN_ERRDEF(SVN_ERR_XML_UNEXPECTED_ELEMENT,
+ SVN_ERR_XML_CATEGORY_START + 5,
+ "Unexpected XML element found")
+
/* io errors */
SVN_ERRDEF(SVN_ERR_IO_INCONSISTENT_EOL,
Modified: subversion/trunk/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/xml.c?rev=1498938&r1=1498937&r2=1498938&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/xml.c Tue Jul 2 13:42:16 2013
@@ -618,7 +618,7 @@ svn_ra_serf__xml_cb_start(svn_ra_serf__x
if (current->state == XML_STATE_INITIAL)
{
return svn_error_createf(
- SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ SVN_ERR_XML_UNEXPECTED_ELEMENT, NULL,
_("XML Parsing failed: Unexpected root element '%s'"),
elemname.name);
}