subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r907414 - /subversion/trunk/subversion/libsvn_wc/questions.c
Date Sun, 07 Feb 2010 11:50:50 GMT
Author: rhuijben
Date: Sun Feb  7 11:50:50 2010
New Revision: 907414

URL: http://svn.apache.org/viewvc?rev=907414&view=rev
Log:
Following up on r89406 and r898492, resolve several Windows test failures
by closing files after usage. Also remove an error leak introduced in
r898492.

* subversion/libsvn_wc/questions.c
  (svn_wc__internal_text_modified_p): Close pristine stream and clear other
    errors than ENOENT.

Modified:
    subversion/trunk/subversion/libsvn_wc/questions.c

Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=907414&r1=907413&r2=907414&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Sun Feb  7 11:50:50 2010
@@ -367,12 +367,15 @@
       return SVN_NO_ERROR;
     }
 
+  SVN_ERR(err);
+
   /* Check all bytes, and verify checksum if requested. */
-  SVN_ERR(compare_and_verify(modified_p, db, local_abspath, pristine_stream,
-                             compare_textbases, force_comparison,
-                             scratch_pool));
+  err = compare_and_verify(modified_p, db, local_abspath, pristine_stream,
+                           compare_textbases, force_comparison,
+                           scratch_pool);
 
-  return SVN_NO_ERROR;
+  return svn_error_compose_create(err,
+                                  svn_stream_close(pristine_stream));
 }
 
 



Mime
View raw message