svn commit: r1512209 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c

[breser]

Author: breser
Date: Fri Aug  9 09:03:21 2013
New Revision: 1512209

URL: http://svn.apache.org/r1512209
Log:
Get rid of ambigiously named variables in checkout_dir().

* subversion/libsvn_ra_serf/commit.c
  (commit_dir): s/p_dir/c_dir/ as in current dir, and s/parent/c_dir_parent/

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/commit.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1512209&r1=1512208&r2=1512209&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Fri Aug  9 09:03:21 2013
@@ -382,7 +382,7 @@ checkout_dir(dir_context_t *dir,
              apr_pool_t *scratch_pool)
 {
   svn_error_t *err;
-  dir_context_t *p_dir = dir;
+  dir_context_t *c_dir = dir;
   const char *checkout_url;
   const char **working;
 
@@ -393,25 +393,25 @@ checkout_dir(dir_context_t *dir,
 
   /* Is this directory or one of our parent dirs newly added?
    * If so, we're already implicitly checked out. */
-  while (p_dir)
+  while (c_dir)
     {
-      if (p_dir->added)
+      if (c_dir->added)
         {
           /* Calculate the working_url by skipping the shared ancestor bewteen
-           * the parent->relpath and dir->relpath.  This is safe since an
+           * the c_dir_parent->relpath and dir->relpath.  This is safe since an
            * add is guaranteed to have a parent that is checked out. */
-          dir_context_t *parent = p_dir->parent_dir;
-          const char *relpath = svn_relpath_skip_ancestor(parent->relpath,
+          dir_context_t *c_dir_parent = c_dir->parent_dir;
+          const char *relpath = 
svn_relpath_skip_ancestor(c_dir_parent->relpath,
                                                           dir->relpath);
 
           /* Implicitly checkout this dir now. */
-          SVN_ERR_ASSERT(parent->working_url);
+          SVN_ERR_ASSERT(c_dir_parent->working_url);
           dir->working_url = svn_path_url_add_component2(
-                                   parent->working_url,
+                                   c_dir_parent->working_url,
                                    relpath, dir->pool);
           return SVN_NO_ERROR;
         }
-      p_dir = p_dir->parent_dir;
+      c_dir = c_dir->parent_dir;
     }
 
   /* We could be called twice for the root: once to checkout the baseline;