svn commit: r1126007 - /subversion/trunk/subversion/libsvn_repos/commit.c

[danielsh]

Author: danielsh
Date: Sun May 22 15:54:16 2011
New Revision: 1126007

URL: http://svn.apache.org/viewvc?rev=1126007&view=rev
Log:
Follow-up to r1125998.

* subversion/libsvn_repos/commit.c
  (verify_mergeinfo):
    Fix both calls to svn_error_createf().

Modified:
    subversion/trunk/subversion/libsvn_repos/commit.c

Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1126007&r1=1126006&r2=1126007&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Sun May 22 15:54:16 2011
@@ -549,14 +549,14 @@ verify_mergeinfo(const svn_string_t *val
   /* Mergeinfo is UTF-8 encoded so the number of bytes returned by strlen()
    * should match VALUE->LEN. Prevents trailing garbage in the property. */
   if (strlen(value->data) != value->len)
-    return svn_error_createf(err, err->apr_err,
+    return svn_error_createf(SVN_ERR_MERGEINFO_PARSE_ERROR, NULL,
                              _("Commit rejected because mergeinfo on '%s' "
                                "contains unexpected string terminator"),
                              path);
 
   err = svn_mergeinfo_parse(&mergeinfo, value->data, scratch_pool);
   if (err)
-    return svn_error_createf(err, err->apr_err,
+    return svn_error_createf(err->apr_err, err,
                              _("Commit rejected because mergeinfo on '%s' "
                                "is syntactically invalid"),
                              path);