svn commit: r1030042 - in /subversion/trunk/subversion/libsvn_wc: entries.c upgrade.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Nov  2 13:43:47 2010
New Revision: 1030042

URL: http://svn.apache.org/viewvc?rev=1030042&view=rev
Log:
Make the data type of wc_id consistent by changing the few instances where
it was apr_uint64_t to apr_int64_t.

* subversion/libsvn_wc/entries.c
  (read_one_entry, read_entries_new, read_entry_pair, write_entry): Use
    type apr_int64_t for wc_id.

* subversion/libsvn_wc/upgrade.c
  (migrate_single_tree_conflict_data, migrate_tree_conflicts): Same.

Modified:
    subversion/trunk/subversion/libsvn_wc/entries.c
    subversion/trunk/subversion/libsvn_wc/upgrade.c

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1030042&r1=1030041&r2=1030042&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Nov  2 13:43:47 2010
@@ -487,7 +487,7 @@ get_base_info_for_deleted(svn_wc_entry_t
 static svn_error_t *
 read_one_entry(const svn_wc_entry_t **new_entry,
                svn_wc__db_t *db,
-               apr_uint64_t wc_id,
+               apr_int64_t wc_id,
                const char *dir_abspath,
                const char *name,
                const svn_wc_entry_t *parent_entry,
@@ -1068,7 +1068,7 @@ read_entries_new(apr_hash_t **result_ent
   apr_pool_t *iterpool = svn_pool_create(scratch_pool);
   int i;
   const svn_wc_entry_t *parent_entry;
-  apr_uint64_t wc_id = 1;  /* ### hacky. should remove.  */
+  apr_int64_t wc_id = 1;  /* ### hacky. should remove.  */
 
   entries = apr_hash_make(result_pool);
 
@@ -1123,7 +1123,7 @@ read_entry_pair(const svn_wc_entry_t **p
                 apr_pool_t *result_pool,
                 apr_pool_t *scratch_pool)
 {
-  apr_uint64_t wc_id = 1;  /* ### hacky. should remove.  */
+  apr_int64_t wc_id = 1;  /* ### hacky. should remove.  */
 
   SVN_ERR(read_one_entry(parent_entry, db, wc_id, dir_abspath,
                          "" /* name */,
@@ -1998,7 +1998,7 @@ write_entry(svn_wc__db_t *db,
           SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
                                             STMT_UPDATE_FILE_EXTERNAL));
           SVN_ERR(svn_sqlite__bindf(stmt, "iss",
-                                    (apr_uint64_t)1 /* wc_id */,
+                                    (apr_int64_t)1 /* wc_id */,
                                     entry->name,
                                     str));
           SVN_ERR(svn_sqlite__step_done(stmt));

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1030042&r1=1030041&r2=1030042&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Nov  2 13:43:47 2010
@@ -720,7 +720,7 @@ db_kind_from_node_kind(svn_node_kind_t n
 static svn_error_t *
 migrate_single_tree_conflict_data(svn_sqlite__db_t *sdb,
                                   const char *tree_conflict_data,
-                                  apr_uint64_t wc_id,
+                                  apr_int64_t wc_id,
                                   const char *local_relpath,
                                   apr_pool_t *scratch_pool)
 {
@@ -847,7 +847,7 @@ migrate_tree_conflicts(svn_sqlite__db_t 
   SVN_ERR(svn_sqlite__step(&have_row, select_stmt));
   while (have_row)
     {
-      apr_uint64_t wc_id;
+      apr_int64_t wc_id;
       const char *local_relpath;
       const char *tree_conflict_data;