You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/05/26 15:38:38 UTC

svn commit: r1127904 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Author: julianfoad
Date: Thu May 26 13:38:37 2011
New Revision: 1127904

URL: http://svn.apache.org/viewvc?rev=1127904&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (insert_external_node): Move a local variable inside the conditional block
    that uses it so it doesn't shadow a variable in the outer scope.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1127904&r1=1127903&r2=1127904&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May 26 13:38:37 2011
@@ -2660,9 +2660,9 @@ insert_external_node(void *baton,
 
   /* And the file external info skel */
   {
-    svn_sqlite__stmt_t *stmt;
     const char *serialized;
 #if SVN_WC__VERSION < SVN_WC__HAS_EXTERNALS_STORE
+    svn_sqlite__stmt_t *stmt;
     svn_opt_revision_t peg_rev;
     svn_opt_revision_t rev;
 



Re: svn commit: r1127904 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Posted by Julian Foad <ju...@wandisco.com>.
On Thu, 2011-05-26 at 09:50 -0400, Greg Stein wrote:
> On May 26, 2011 9:39 AM, <ju...@apache.org> wrote:
> >
> > Author: julianfoad
> > Date: Thu May 26 13:38:37 2011
> > New Revision: 1127904
> >
> > URL: http://svn.apache.org/viewvc?rev=1127904&view=rev
> > Log:
> > * subversion/libsvn_wc/wc_db.c
> >  (insert_external_node): Move a local variable inside the conditional
> block
> >    that uses it so it doesn't shadow a variable in the outer scope.
> 
> But it still shadows on some builds. That sounds bad.

No, the outer variable is conditional on the opposite condition.

- Julian



Re: svn commit: r1127904 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

Posted by Greg Stein <gs...@gmail.com>.
On May 26, 2011 9:39 AM, <ju...@apache.org> wrote:
>
> Author: julianfoad
> Date: Thu May 26 13:38:37 2011
> New Revision: 1127904
>
> URL: http://svn.apache.org/viewvc?rev=1127904&view=rev
> Log:
> * subversion/libsvn_wc/wc_db.c
>  (insert_external_node): Move a local variable inside the conditional
block
>    that uses it so it doesn't shadow a variable in the outer scope.

But it still shadows on some builds. That sounds bad.