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

[stsp]

Author: stsp
Date: Thu May  7 09:48:25 2015
New Revision: 1678151

URL: http://svn.apache.org/r1678151
Log:
Follow-up to r1678150:

* subversion/libsvn_fs_fs/cached_data.c
  (svn_fs_fs__get_proplist): Don't quick-wrap hash parsing errors but add an
   error to the chain. This way, the hash parser's error message is preserved.

* subversion/libsvn_fs_fs/fs_fs.c
  (get_node_origins_from_file): Likewise.

* subversion/libsvn_fs_fs/recovery.c
  (recover_find_max_ids): Likewise.

* subversion/libsvn_fs_fs/transaction.c
  (get_txn_proplist): Likewise.

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=1678151&r1=1678150&r2=1678151&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Thu May  7 09:48:25 
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);
 
           svn_error_clear(svn_stream_close(stream));
-          return svn_error_quick_wrapf(err,
+          return svn_error_createf(SVN_ERR_FS_CORRUPT, 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);
           
           svn_error_clear(svn_stream_close(stream));
-          return svn_error_quick_wrapf(err,
+          return svn_error_createf(SVN_ERR_FS_CORRUPT, 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=1678151&r1=1678150&r2=1678151&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu May  7 09:48:25 2015
@@ -1917,8 +1917,9 @@ 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_quick_wrapf(err, _("malformed node origin data in '%s'"),
-                                 node_origins_file);
+    return svn_error_createf(SVN_ERR_FS_CORRUPT, 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=1678151&r1=1678150&r2=1678151&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/recovery.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/recovery.c Thu May  7 09:48:25 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);
 
       svn_error_clear(svn_stream_close(stream));
-      return svn_error_quick_wrapf(err,
+      return svn_error_createf(SVN_ERR_FS_CORRUPT, 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=1678151&r1=1678150&r2=1678151&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Thu May  7 09:48:25 
2015
@@ -1146,8 +1146,8 @@ get_txn_proplist(apr_hash_t *proplist,
   if (err)
     {
       svn_error_clear(svn_stream_close(stream));  
-      return svn_error_quick_wrapf(err,
-               _("malformed property list in transaction '%s'"),
+      return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+               _("malformed transaction property list in '%s'"),
                path_txn_props(fs, txn_id, pool));
     }