On Fri, Jan 13, 2012 at 3:44 AM, <phi...@apache.org> wrote: > Author: philip > Date: Fri Jan 13 09:44:41 2012 > New Revision: 1230969 > > URL: http://svn.apache.org/viewvc?rev=1230969&view=rev > Log: > Avoid a compiler warning about shadowing. > > * subversion/libsvn_delta/compat.c > (ev2_add_directory, ev2_open_directory, ev2_open_file): Rename variable. > > Modified: > subversion/trunk/subversion/libsvn_delta/compat.c > > Modified: subversion/trunk/subversion/libsvn_delta/compat.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1230969&r1=1230968&r2=1230969&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_delta/compat.c (original) > +++ subversion/trunk/subversion/libsvn_delta/compat.c Fri Jan 13 09:44:41 2012 > @@ -498,9 +498,9 @@ ev2_add_directory(const char *path, > > if (pb->copyfrom_path) > { > - const char *basename = svn_relpath_basename(path, result_pool); > + const char *name = svn_relpath_basename(path, result_pool);
What is this shadowing? My compiler isn't picking it up... -Hyrum > cb->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, > - "/", basename, NULL); > + "/", name, NULL); > cb->copyfrom_rev = pb->copyfrom_rev; > } > } > @@ -537,10 +537,10 @@ ev2_open_directory(const char *path, > if (pb->copyfrom_path) > { > /* We are inside a copy. */ > - const char *basename = svn_relpath_basename(path, result_pool); > + const char *name = svn_relpath_basename(path, result_pool); > > db->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, > - "/", basename, NULL); > + "/", name, NULL); > db->copyfrom_rev = pb->copyfrom_rev; > } > > @@ -650,9 +650,9 @@ ev2_open_file(const char *path, > { > /* We're in a copied directory, so the delta base is going to be > based up on the copy source. */ > - const char *basename = svn_relpath_basename(path, result_pool); > + const char *name = svn_relpath_basename(path, result_pool); > const char *copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, > - "/", basename, NULL); > + "/", name, NULL); > > SVN_ERR(fb->eb->fetch_base_func(&fb->delta_base, > fb->eb->fetch_base_baton, > > -- uberSVN: Apache Subversion Made Easy http://www.uberSVN.com/