You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2019/03/06 04:00:23 UTC
svn commit: r1854888 - in /subversion/branches/1.11.x: ./ STATUS
subversion/libsvn_subr/error.c
Author: svn-role
Date: Wed Mar 6 04:00:23 2019
New Revision: 1854888
URL: http://svn.apache.org/viewvc?rev=1854888&view=rev
Log:
Merge r1853761 from trunk:
* r1853761
Fix an "unused static function" warning in non-maintainer mode builds.
Justification:
Requested on dev@. Fixes a compiler warning.
Votes:
+1: danielsh, brane, stsp
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/libsvn_subr/error.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 6 04:00:23 2019
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1851676,1851687,1851791
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1851676,1851687,1851791,1853761
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1854888&r1=1854887&r2=1854888&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Mar 6 04:00:23 2019
@@ -92,10 +92,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1853761
- Fix an "unused static function" warning in non-maintainer mode builds.
- Justification:
- Requested on dev@. Fixes a compiler warning.
- Votes:
- +1: danielsh, brane, stsp
Modified: subversion/branches/1.11.x/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_subr/error.c?rev=1854888&r1=1854887&r2=1854888&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_subr/error.c (original)
+++ subversion/branches/1.11.x/subversion/libsvn_subr/error.c Wed Mar 6 04:00:23 2019
@@ -146,6 +146,7 @@ svn_error__locate(const char *file, long
/* Cleanup function for errors. svn_error_clear () removes this so
errors that are properly handled *don't* hit this code. */
+#ifdef SVN_DEBUG
static apr_status_t err_abort(void *data)
{
svn_error_t *err = data; /* For easy viewing in a debugger */
@@ -155,6 +156,7 @@ static apr_status_t err_abort(void *data
abort();
return APR_SUCCESS;
}
+#endif
static svn_error_t *