subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1514151 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_subr/utf.c
Date Thu, 15 Aug 2013 04:00:46 GMT
Author: svn-role
Date: Thu Aug 15 04:00:46 2013
New Revision: 1514151

URL: http://svn.apache.org/r1514151
Log:
Merge the r1503010 group from trunk:

 * r1503010, r1503058, r1503061, r1503211
   svn_utf_*: Describe APR errors as coming from APR.
   Justification:
     It is not obvious what needs to be recompiled to resolve "This function
     has not been implemented on this platform".  We do the same for SQLite.
     .
     The current code will not enter the error path in the ENOTIMPL case; that
     is being discussed on dev@ still.  The "Justification" field uses that
     error code is used as an example only.
   Votes:
     +1: danielsh, rhuijben, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_subr/utf.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1503058,1503061,1503211

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1514151&r1=1514150&r2=1514151&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Aug 15 04:00:46 2013
@@ -230,18 +230,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1503010, r1503058, r1503061, r1503211
-   svn_utf_*: Describe APR errors as coming from APR.
-   Justification:
-     It is not obvious what needs to be recompiled to resolve "This function
-     has not been implemented on this platform".  We do the same for SQLite.
-     .
-     The current code will not enter the error path in the ENOTIMPL case; that
-     is being discussed on dev@ still.  The "Justification" field uses that
-     error code is used as an example only.
-   Votes:
-     +1: danielsh, rhuijben, stefan2
-
  * r1504192, r1504505
    Make 'svn diff' continue on missing and obstructing files.
    This resolves issue 4396

Modified: subversion/branches/1.8.x/subversion/libsvn_subr/utf.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/utf.c?rev=1514151&r1=1514150&r2=1514151&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/utf.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/utf.c Thu Aug 15 04:00:46 2013
@@ -212,6 +212,7 @@ xlate_alloc_handle(xlate_handle_node_t *
 {
   apr_status_t apr_err;
   apr_xlate_t *handle;
+  const char *name;
 
   /* The error handling doesn't support the following cases, since we don't
      use them currently.  Catch this here. */
@@ -224,8 +225,10 @@ xlate_alloc_handle(xlate_handle_node_t *
 #if defined(WIN32)
   apr_err = svn_subr__win32_xlate_open((win32_xlate_t **)&handle, topage,
                                        frompage, pool);
+  name = "win32-xlate: ";
 #else
   apr_err = apr_xlate_open(&handle, topage, frompage, pool);
+  name = "APR: ";
 #endif
 
   if (APR_STATUS_IS_EINVAL(apr_err) || APR_STATUS_IS_ENOTIMPL(apr_err))
@@ -254,9 +257,9 @@ xlate_alloc_handle(xlate_handle_node_t *
          later.  APR_STRERR will be in the local encoding, not in UTF-8, though.
        */
       svn_strerror(apr_err, apr_strerr, sizeof(apr_strerr));
-      return svn_error_create(apr_err, 
-                              svn_error_create(apr_err, NULL, apr_strerr),
-                              errstr);
+      return svn_error_createf(SVN_ERR_PLUGIN_LOAD_FAILURE, 
+                               svn_error_create(apr_err, NULL, apr_strerr),
+                               "%s%s", name, errstr);
     }
 
   /* Allocate and initialize the node. */



Mime
View raw message