svn commit: r1709622 - in /subversion/trunk/subversion/libsvn_fs_x: cached_data.c transaction.c

[st...@apache.org]

Author: stefan2
Date: Tue Oct 20 15:10:26 2015
New Revision: 1709622

URL: http://svn.apache.org/viewvc?rev=1709622&view=rev
Log:
Follow-up to r1709621 fixing compilation.

* subversion/libsvn_fs_x/cached_data.c
  (svn_fs_x__get_proplist): Add missing ERR declaration and fix the
                            ID stringification calls.

* subversion/libsvn_fs_x/transaction.c
  (get_txn_proplist): Add missing ERR declaration and fix the error
                      construction.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/cached_data.c
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1709622&r1=1709621&r2=1709622&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Tue Oct 20 15:10:26 2015
@@ -2665,6 +2665,7 @@ svn_fs_x__get_proplist(apr_hash_t **prop
   apr_hash_t *proplist;
   svn_stream_t *stream;
   const svn_fs_x__id_t *noderev_id = &noderev->noderev_id;
+  svn_error_t *err;
 
   if (noderev->prop_rep
       && !svn_fs_x__is_revision(noderev->prop_rep->id.change_set))
@@ -2680,7 +2681,7 @@ svn_fs_x__get_proplist(apr_hash_t **prop
                           result_pool);
       if (err)
         {
-          svn_string_t *id_str = svn_fs_x__id_unparse(noderev->id,
+          svn_string_t *id_str = svn_fs_x__id_unparse(&noderev->noderev_id,
                                                       scratch_pool);
 
           err = svn_error_compose_create(err, svn_stream_close(stream));
@@ -2715,8 +2716,8 @@ svn_fs_x__get_proplist(apr_hash_t **prop
                            result_pool);
       if (err)
         {
-          svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id,
-                                                       scratch_pool);
+          svn_string_t *id_str = svn_fs_x__id_unparse(&noderev->noderev_id,
+                                                      scratch_pool);
 
           err = svn_error_compose_create(err, svn_stream_close(stream));
           return svn_error_createf(SVN_ERR_FS_CORRUPT, err,

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1709622&r1=1709621&r2=1709622&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Tue Oct 20 15:10:26 2015
@@ -1371,6 +1371,7 @@ get_txn_proplist(apr_hash_t *proplist,
                  apr_pool_t *scratch_pool)
 {
   svn_stream_t *stream;
+  svn_error_t *err;
 
   /* Check for issue #3696. (When we find and fix the cause, we can change
    * this to an assertion.) */
@@ -1387,13 +1388,13 @@ get_txn_proplist(apr_hash_t *proplist,
 
   /* Read in the property list. */
   err = svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR,
-                       scratch_pool));
+                       scratch_pool);
   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'"),
-               path_txn_props(fs, txn_id, pool));
+               svn_fs_x__path_txn_props(fs, txn_id, scratch_pool));
     }
 
   return svn_stream_close(stream);