You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/02/19 22:45:43 UTC
svn commit: r911996 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: pburba
Date: Fri Feb 19 21:45:43 2010
New Revision: 911996
URL: http://svn.apache.org/viewvc?rev=911996&view=rev
Log:
Follow-up to r911848, rework to fix broken VS2008 build.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_pristine_read,
svn_wc__db_pristine_install): Move #ifndef out of SVN_ERR macro
the VS2008 preprocessor can't handle this.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=911996&r1=911995&r2=911996&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Feb 19 21:45:43 2010
@@ -2253,6 +2253,7 @@
svn_wc__db_pdh_t *pdh;
const char *local_relpath;
const char *pristine_abspath;
+ svn_error_t *err;
SVN_ERR_ASSERT(contents != NULL);
SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath));
@@ -2267,11 +2268,12 @@
/* ### should we look in the PRISTINE table for anything? */
- SVN_ERR(get_pristine_fname(&pristine_abspath, pdh, checksum,
+ err = get_pristine_fname(&pristine_abspath, pdh, checksum,
#ifndef SVN__SKIP_SUBDIR
- FALSE /* create_subdir */,
+ FALSE /* create_subdir */,
#endif
- scratch_pool, scratch_pool));
+ scratch_pool, scratch_pool);
+ SVN_ERR(err);
return svn_error_return(svn_stream_open_readonly(
contents, pristine_abspath,
@@ -2356,6 +2358,7 @@
const char *pristine_abspath;
apr_finfo_t finfo;
svn_sqlite__stmt_t *stmt;
+ svn_error_t *err;
SVN_ERR_ASSERT(svn_dirent_is_absolute(tempfile_abspath));
SVN_ERR_ASSERT(sha1_checksum != NULL);
@@ -2376,11 +2379,12 @@
scratch_pool, scratch_pool));
VERIFY_USABLE_PDH(pdh);
- SVN_ERR(get_pristine_fname(&pristine_abspath, pdh, sha1_checksum,
+ err = get_pristine_fname(&pristine_abspath, pdh, sha1_checksum,
#ifndef SVN__SKIP_SUBDIR
- TRUE /* create_subdir */,
+ TRUE /* create_subdir */,
#endif
- scratch_pool, scratch_pool));
+ scratch_pool, scratch_pool);
+ SVN_ERR(err);
/* Put the file into its target location. */
SVN_ERR(svn_io_file_rename(tempfile_abspath, pristine_abspath,