You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/05/14 18:48:01 UTC
svn commit: r1482448 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/nls.c
Author: breser
Date: Tue May 14 16:48:01 2013
New Revision: 1482448
URL: http://svn.apache.org/r1482448
Log:
* r1482282
Don't use unitialized variable to produce an error code.
Justification:
Silence compiler warning. Getting in this error path is as far as I can
tell impossible on Windows 2000 and later, but might be possible on Wine.
(Getting into this error path requires an on-disk path of the running
application that can't be expressed in unicode, which is very hard if the
path itself is stored in Unicode)
Votes:
+1: rhuijben, breser, stsp
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/nls.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1482282
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482448&r1=1482447&r2=1482448&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:48:01 2013
@@ -85,17 +85,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1482282
- Don't use unitialized variable to produce an error code.
- Justification:
- Silence compiler warning. Getting in this error path is as far as I can
- tell impossible on Windows 2000 and later, but might be possible on Wine.
- (Getting into this error path requires an on-disk path of the running
- application that can't be expressed in unicode, which is very hard if the
- path itself is stored in Unicode)
- Votes:
- +1: rhuijben, breser, stsp
-
* r1481594
Speed up reporting and authz checks on copy-from info in 'svn log'.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/nls.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/nls.c?rev=1482448&r1=1482447&r2=1482448&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/nls.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/nls.c Tue May 14 16:48:01 2013
@@ -56,7 +56,6 @@ svn_nls_init(void)
char* utf8_path;
const char* internal_path;
apr_pool_t* pool;
- apr_status_t apr_err;
apr_size_t inwords, outbytes, outlength;
apr_pool_create(&pool, 0);
@@ -99,10 +98,10 @@ svn_nls_init(void)
if (outbytes == 0)
{
- err = svn_error_createf(apr_err, NULL,
- _("Can't convert module path "
- "to UTF-8 from UCS-2: '%s'"),
- ucs2_path);
+ err = svn_error_wrap_apr(apr_get_os_error(),
+ _("Can't convert module path "
+ "to UTF-8 from UCS-2: '%s'"),
+ ucs2_path);
}
else
{