You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/05/11 13:13:59 UTC

svn commit: r1678725 - in /subversion/trunk/subversion/libsvn_fs_fs: cached_data.c fs_fs.c recovery.c transaction.c

Author: stsp
Date: Mon May 11 11:13:59 2015
New Revision: 1678725

URL: http://svn.apache.org/r1678725
Log:
Revert r1678151. I misunderstood the quick_wrap API, believing it
simply replaced the original error's message, but in fact it creates
a new error chained with the error passed in.

Found by: rhuijben

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_fs_fs/recovery.c
    subversion/trunk/subversion/libsvn_fs_fs/transaction.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1678725&r1=1678724&r2=1678725&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Mon May 11 11:13:59 2015
@@ -2736,7 +2736,7 @@ svn_fs_fs__get_proplist(apr_hash_t **pro
           svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
 
           err = svn_error_compose_create(err, svn_stream_close(stream));
-          return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+          return svn_error_quick_wrapf(err,
                    _("malformed property list for node-revision '%s' in '%s'"),
                    id_str->data, filename);
         }
@@ -2769,7 +2769,7 @@ svn_fs_fs__get_proplist(apr_hash_t **pro
           svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
 
           err = svn_error_compose_create(err, svn_stream_close(stream));
-          return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+          return svn_error_quick_wrapf(err,
                    _("malformed property list for node-revision '%s'"),
                    id_str->data);
         }

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1678725&r1=1678724&r2=1678725&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Mon May 11 11:13:59 2015
@@ -1917,9 +1917,8 @@ get_node_origins_from_file(svn_fs_t *fs,
   *node_origins = apr_hash_make(pool);
   err = svn_hash_read2(*node_origins, stream, SVN_HASH_TERMINATOR, pool);
   if (err)
-    return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
-                             _("malformed node origin data in '%s'"),
-                             node_origins_file);
+    return svn_error_quick_wrapf(err, _("malformed node origin data in '%s'"),
+                                 node_origins_file);
   return svn_stream_close(stream);
 }
 

Modified: subversion/trunk/subversion/libsvn_fs_fs/recovery.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/recovery.c?rev=1678725&r1=1678724&r2=1678725&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/recovery.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/recovery.c Mon May 11 11:13:59 2015
@@ -210,7 +210,7 @@ recover_find_max_ids(svn_fs_t *fs,
       svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
 
       err = svn_error_compose_create(err, svn_stream_close(stream));
-      return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+      return svn_error_quick_wrapf(err,
                 _("malformed representation for node-revision '%s'"),
                 id_str->data);
     }

Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1678725&r1=1678724&r2=1678725&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Mon May 11 11:13:59 2015
@@ -1146,8 +1146,8 @@ get_txn_proplist(apr_hash_t *proplist,
   if (err)
     {
       err = svn_error_compose_create(err, svn_stream_close(stream));
-      return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
-               _("malformed transaction property list in '%s'"),
+      return svn_error_quick_wrapf(err,
+               _("malformed property list in transaction '%s'"),
                path_txn_props(fs, txn_id, pool));
     }