harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r585236 - /harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
Date Tue, 16 Oct 2007 19:55:33 GMT
Author: hindessm
Date: Tue Oct 16 12:55:33 2007
New Revision: 585236

URL: http://svn.apache.org/viewvc?rev=585236&view=rev
Log:
While fixing the earlier compiler warnings, I wondered what these
local variables were intended to achieve.  I think they are
unnecessary.  I'm sure someone will correct me if I'm wrong.

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp?rev=585236&r1=585235&r2=585236&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
Tue Oct 16 12:55:33 2007
@@ -24,10 +24,9 @@
         return 0;
         
 	fint counter=0;
-	const fwchar_t* tmpstr = str;
-	while(*tmpstr != 0)
+	while(*str != 0)
 	{
-		tmpstr++;
+		str++;
 		counter++;
 	}
 	return counter;
@@ -38,15 +37,13 @@
     if (str1 == 0 || str2 == 0)
         return (fint)(str1 - (fwchar_t*)str2);
         
-        const fwchar_t* tmpstr1 = str1; 
-	const fchar* tmpstr2 = str2;
-	while(*tmpstr1 != 0 || *tmpstr2 !=0)
+	while(*str1 != 0 || *str2 !=0)
 	{
-        if (*tmpstr1 != (fwchar_t)(*tmpstr2))
+        if (*str1 != (fwchar_t)(*str2))
 			return -1;
 
-		tmpstr1++;
-		tmpstr2++;
+		str1++;
+		str2++;
 	}
 
 	return 0;
@@ -57,15 +54,13 @@
     if (str1 == 0 || str2 == 0)
         return (fint)(str1 - str2);
         
-	const fwchar_t* tmpstr1 = str1; 
-	const fwchar_t* tmpstr2 = str2;
-	while(*tmpstr1 != 0 || *tmpstr2 !=0)
+	while(*str1 != 0 || *str2 !=0)
 	{
-        if (*tmpstr1 != *tmpstr2)
+        if (*str1 != *str2)
 			return -1;
 
-		tmpstr1++;
-		tmpstr2++;
+		str1++;
+		str2++;
 	}
 
 	return 0;



Mime
View raw message