svn commit: r1042687 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Dec  6 15:54:35 2010
New Revision: 1042687

URL: http://svn.apache.org/viewvc?rev=1042687&view=rev
Log:
Make sure that two variables are initialized before they are being used to
avoid an error while debugging with assignment validations. This should fix
the test failures on the Windows buildbot.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_scan_addition): Initialize two variables to avoid using
    unitialized variable assertions in the calls to fetch_repos_info.

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=1042687&r1=1042686&r2=1042687&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Dec  6 15:54:35 2010
@@ -6980,7 +6980,8 @@ svn_wc__db_scan_addition(svn_wc__db_stat
   svn_wc__db_pdh_t *pdh;
   const char *local_relpath;
   const char *op_root_relpath;
-  apr_int64_t repos_id, original_repos_id;
+  apr_int64_t repos_id = INVALID_REPOS_ID;
+  apr_int64_t original_repos_id = INVALID_REPOS_ID;
   apr_int64_t *repos_id_p
     = (repos_root_url || repos_uuid) ? &repos_id : NULL;
   apr_int64_t *original_repos_id_p
@@ -7003,6 +7004,7 @@ svn_wc__db_scan_addition(svn_wc__db_stat
                                        result_pool);
   /* REPOS_ID must be valid if requested; ORIGINAL_REPOS_ID need not be. */
   SVN_ERR_ASSERT(repos_id_p == NULL || repos_id != INVALID_REPOS_ID);
+
   SVN_ERR(fetch_repos_info(repos_root_url, repos_uuid, pdh->wcroot->sdb,
                            repos_id, result_pool));
   SVN_ERR(fetch_repos_info(original_root_url, original_uuid,