subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r960039 - /subversion/trunk/subversion/libsvn_wc/node.c
Date Fri, 02 Jul 2010 15:56:08 GMT
Author: philip
Date: Fri Jul  2 15:56:08 2010
New Revision: 960039

URL: http://svn.apache.org/viewvc?rev=960039&view=rev
Log:
* subversion/libsvn_wc/node.c
  (svn_wc__node_get_repos_relpath): Avoid using basename as a variable
   as it shadows the standard function.

Modified:
    subversion/trunk/subversion/libsvn_wc/node.c

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=960039&r1=960038&r2=960039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Fri Jul  2 15:56:08 2010
@@ -442,9 +442,9 @@ svn_wc__node_get_repos_relpath(const cha
                    && (status == svn_wc__db_status_deleted
                        || status == svn_wc__db_status_obstructed_delete)))
         {
-          const char *parent_abspath, *basename, *parent_relpath;
+          const char *parent_abspath, *name, *parent_relpath;
 
-          svn_dirent_split(&parent_abspath, &basename, local_abspath,
+          svn_dirent_split(&parent_abspath, &name, local_abspath,
                            scratch_pool);
           SVN_ERR(svn_wc__node_get_repos_relpath(&parent_relpath, wc_ctx,
                                                  parent_abspath,
@@ -452,7 +452,7 @@ svn_wc__node_get_repos_relpath(const cha
                                                  scratch_pool));
 
           if (parent_relpath)
-            *repos_relpath = svn_relpath_join(parent_relpath, basename,
+            *repos_relpath = svn_relpath_join(parent_relpath, name,
                                               result_pool);
         }
       else



Mime
View raw message