Author: hwright
Date: Tue Jul 19 19:07:58 2011
New Revision: 1148488
URL: http://svn.apache.org/viewvc?rev=1148488&view=rev
Log:
Merge r1148374 from trunk:
* r1148374
Silence a debug message in the DSO loading code.
Justification:
The message could lead to spurious test failures in some situations.
It is also confusing because it is printed without any context information.
(Normal library functions should never use stdio)
Votes:
+1: stsp, rhuijben, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_subr/dso.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 19:07:58 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148374
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1148488&r1=1148487&r2=1148488&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Jul 19 19:07:58 2011
@@ -65,12 +65,3 @@ Candidate changes:
Approved changes:
=================
-
- * r1148374
- Silence a debug message in the DSO loading code.
- Justification:
- The message could lead to spurious test failures in some situations.
- It is also confusing because it is printed without any context
information.
- (Normal library functions should never use stdio)
- Votes:
- +1: stsp, rhuijben, cmpilato
Modified: subversion/branches/1.7.x/subversion/libsvn_subr/dso.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/dso.c?rev=1148488&r1=1148487&r2=1148488&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/dso.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/dso.c Tue Jul 19 19:07:58
2011
@@ -105,7 +105,7 @@ svn_dso_load(apr_dso_handle_t **dso, con
status = apr_dso_load(dso, fname, dso_pool);
if (status)
{
-#ifdef SVN_DEBUG
+#if 0
char buf[1024];
fprintf(stderr, "%s\n", apr_dso_error(*dso, buf, 1024));
#endif
