svn commit: r941472 - /subversion/trunk/subversion/libsvn_client/commit_util.c

[ne...@apache.org]

Author: neels
Date: Wed May  5 20:28:30 2010
New Revision: 941472

URL: http://svn.apache.org/viewvc?rev=941472&view=rev
Log:
Fix ill var naming from r941094.

* subversion/libsvn_client/commit_util.c
  (harvest_committables):
    Rename sub-scoped copyfrom_url/_rev to node_*, to get rid of a compiler
    warning.

Modified:
    subversion/trunk/subversion/libsvn_client/commit_util.c

Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=941472&r1=941471&r2=941472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Wed May  5 20:28:30 2010
@@ -562,11 +562,11 @@ harvest_committables(apr_hash_t *committ
   if (is_added)
     {
       svn_boolean_t is_copy_target;
-      const char *copyfrom_url;
-      svn_revnum_t copyfrom_rev;
+      const char *node_copyfrom_url;
+      svn_revnum_t node_copyfrom_rev;
 
-      SVN_ERR(svn_wc__node_get_copyfrom_info(&copyfrom_url,
-                                             &copyfrom_rev,
+      SVN_ERR(svn_wc__node_get_copyfrom_info(&node_copyfrom_url,
+                                             &node_copyfrom_rev,
                                              &is_copy_target,
                                              ctx->wc_ctx, local_abspath,
                                              scratch_pool, scratch_pool));
@@ -574,11 +574,11 @@ harvest_committables(apr_hash_t *committ
         {
           state_flags |= SVN_CLIENT_COMMIT_ITEM_ADD;
           state_flags |= SVN_CLIENT_COMMIT_ITEM_IS_COPY;
-          cf_url = copyfrom_url;
-          cf_rev = copyfrom_rev;
+          cf_url = node_copyfrom_url;
+          cf_rev = node_copyfrom_rev;
           adds_only = FALSE;
         }
-      else if (!copyfrom_url)
+      else if (!node_copyfrom_url)
         {
           state_flags |= SVN_CLIENT_COMMIT_ITEM_ADD;
           adds_only = TRUE;