subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1329306 - in /subversion/branches/ev2-export/subversion/libsvn_client: add.c commit.c
Date Mon, 23 Apr 2012 15:57:29 GMT
Author: hwright
Date: Mon Apr 23 15:57:29 2012
New Revision: 1329306

URL: http://svn.apache.org/viewvc?rev=1329306&view=rev
Log:
On the ev2-export branch:
Rename a couple of variable to avoid a clash with a POSIX function name.

* subversion/libsvn_client/add.c
  (mkdir_urls, import_children): s/basename/base_name/

Modified:
    subversion/branches/ev2-export/subversion/libsvn_client/add.c
    subversion/branches/ev2-export/subversion/libsvn_client/commit.c

Modified: subversion/branches/ev2-export/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/add.c?rev=1329306&r1=1329305&r2=1329306&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/add.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/add.c Mon Apr 23 15:57:29 2012
@@ -934,10 +934,10 @@ mkdir_urls(const apr_array_header_t *url
     {
       const char *path = APR_ARRAY_IDX(targets, i, const char *);
       const char *parent;
-      const char *basename;
+      const char *base_name;
       apr_array_header_t *children;
       
-      svn_relpath_split(&parent, &basename, path, pool);
+      svn_relpath_split(&parent, &base_name, path, pool);
 
       children = apr_hash_get(children_hash, parent, APR_HASH_KEY_STRING);
       if (!children)
@@ -946,7 +946,7 @@ mkdir_urls(const apr_array_header_t *url
           apr_hash_set(children_hash, parent, APR_HASH_KEY_STRING, children);
         }
 
-      APR_ARRAY_PUSH(children, const char *) = basename;
+      APR_ARRAY_PUSH(children, const char *) = base_name;
     }
 
   /* Calculate the base_relpath. */

Modified: subversion/branches/ev2-export/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/commit.c?rev=1329306&r1=1329305&r2=1329306&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/commit.c Mon Apr 23 15:57:29 2012
@@ -378,7 +378,7 @@ import_children(const char *dir_abspath,
     {
       const char *local_abspath;
       const char *relpath;
-      const char *basename = svn__apr_hash_index_key(hi);
+      const char *base_name = svn__apr_hash_index_key(hi);
       const svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi);
 
       svn_pool_clear(iterpool);
@@ -389,8 +389,8 @@ import_children(const char *dir_abspath,
       /* Typically, we started importing from ".", in which case
          edit_path is "".  So below, this_path might become "./blah",
          and this_edit_path might become "blah", for example. */
-      local_abspath = svn_dirent_join(dir_abspath, basename, iterpool);
-      relpath = svn_relpath_join(dir_relpath, basename, iterpool);
+      local_abspath = svn_dirent_join(dir_abspath, base_name, iterpool);
+      relpath = svn_relpath_join(dir_relpath, base_name, iterpool);
 
       if (dirent->kind == svn_node_dir && depth >= svn_depth_immediates)
         {



Mime
View raw message