stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r632143 - /stdcxx/trunk/tests/src/braceexp.cpp
Date Thu, 28 Feb 2008 22:37:42 GMT
Author: vitek
Date: Thu Feb 28 14:37:41 2008
New Revision: 632143

URL: http://svn.apache.org/viewvc?rev=632143&view=rev
Log:

2008-02-28  Travis Vitek  <vitek@roguewave.com>

	* tests/src/braceexp.cpp (rw_shell_expand): Eliminate shadowed
	variable warnings for s and n.

Modified:
    stdcxx/trunk/tests/src/braceexp.cpp

Modified: stdcxx/trunk/tests/src/braceexp.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/braceexp.cpp?rev=632143&r1=632142&r2=632143&view=diff
==============================================================================
--- stdcxx/trunk/tests/src/braceexp.cpp (original)
+++ stdcxx/trunk/tests/src/braceexp.cpp Thu Feb 28 14:37:41 2008
@@ -1052,16 +1052,16 @@
         if (exp) {
 
             // in case user uses a null seperator
-            const char* s = exp;
-            for (/**/; *s; s += strlen (s) + 1)
+            const char* term = exp;
+            for (/**/; *term; term += strlen (term) + 1)
                 ;
 
-            const _RWSTD_SIZE_T n = exp < s ? (s - exp) - 1 : 0;
+            const _RWSTD_SIZE_T len = exp < term ? (term - exp) - 1 : 0;
         
             if (is_first_expand)
-                app = result.append (exp, n);
+                app = result.append (exp, len);
             else if (result.append (&sep, 1))
-                app = result.append (exp, n);
+                app = result.append (exp, len);
         }
 
         is_first_expand = false;



Mime
View raw message