[[ Cleanup ]] Remove MCNameIsEqualToCString

runrevmark · runrevmark · commit 19d82fc6c153 · 2017-09-06T17:51:15.000+01:00
This patch removes MCNameIsEqualToCString and replaces it
MCStringIsEqualToCString(MCNameGetString(...), ...).
diff --git a/engine/src/bitmapeffect.cpp b/engine/src/bitmapeffect.cpp
@@ -92,7 +92,7 @@ static Exec_stat MCBitmapEffectLookupProperty(MCBitmapEffectType p_type, MCNameR
 	for(uint4 i = 0; i < ELEMENTS(s_bitmap_effect_properties); i++)
 	{
 		// Check to see if we've found a match.
-		if (MCNameIsEqualToCString(p_token, s_bitmap_effect_properties[i] . token, kMCCompareCaseless))
+		if (MCStringIsEqualToCString(MCNameGetString(p_token), s_bitmap_effect_properties[i] . token, kMCCompareCaseless))
 		{
 			// Check to see if its applicable to this type.
 			if ((s_bitmap_effect_properties[i] . mask & (1 << p_type)) != 0)
diff --git a/engine/src/foundation-legacy.cpp b/engine/src/foundation-legacy.cpp
@@ -1105,11 +1105,6 @@ char MCNameGetCharAtIndex(MCNameRef p_name, uindex_t p_at)
 	return MCStringGetNativeCharAtIndex(MCNameGetString(p_name), p_at);
 }
 
-bool MCNameIsEqualToCString(MCNameRef p_left, const char *p_cstring, MCCompareOptions p_options)
-{
-	return MCStringIsEqualToCString(MCNameGetString(p_left), p_cstring, p_options);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 struct get_array_extent_context_t
diff --git a/engine/src/foundation-legacy.h b/engine/src/foundation-legacy.h
@@ -82,8 +82,6 @@ bool MCNameGetAsIndex(MCNameRef name, index_t& r_index);
 
 char MCNameGetCharAtIndex(MCNameRef name, uindex_t at);
 
-bool MCNameIsEqualToCString(MCNameRef left, const char *cstring, MCCompareOptions options);
-
 ////////////////////////////////////////////////////////////////////////////////
 
 enum IO_stat
diff --git a/engine/src/gradient.cpp b/engine/src/gradient.cpp
@@ -63,7 +63,7 @@ static Exec_stat MCGradientFillLookupProperty(MCNameRef p_token, MCGradientFillP
 	uint4 tablesize = ELEMENTS(gradientprops);
 	while (tablesize--)
 	{
-		if (MCNameIsEqualToCString(p_token, gradientprops[tablesize].token, kMCCompareCaseless))
+		if (MCStringIsEqualToCString(MCNameGetString(p_token), gradientprops[tablesize].token, kMCCompareCaseless))
 		{
 			r_prop = gradientprops[tablesize].value;
 			return ES_NORMAL;
diff --git a/engine/src/mblhandlers.cpp b/engine/src/mblhandlers.cpp
@@ -4605,7 +4605,7 @@ bool MCIsPlatformMessage(MCNameRef handler_name)
     
     for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
     {
-		if (MCNameIsEqualToCString(handler_name, s_platform_messages[i].message, kMCCompareCaseless))
+		if (MCStringIsEqualToCString(MCNameGetString(handler_name), s_platform_messages[i].message, kMCCompareCaseless))
 			found = true;
     }
     
@@ -4662,7 +4662,7 @@ bool MCDoHandlePlatformMessage(bool p_waitable, MCPlatformMessageHandler p_handl
 bool MCHandlePlatformMessage(MCNameRef p_message, MCParameter *p_parameters, Exec_stat& r_result)
 {
 	for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
-		if (MCNameIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareCaseless))
+		if (MCStringIsEqualToCString(MCNameGetString(p_message), s_platform_messages[i] . message, kMCCompareCaseless))
 		{
             return MCDoHandlePlatformMessage(s_platform_messages[i] . waitable, s_platform_messages[i] . handler, s_platform_messages[i] . context, p_parameters, r_result);
 		}
diff --git a/engine/src/mbliphone.mm b/engine/src/mbliphone.mm
@@ -698,7 +698,7 @@ virtual uint64_t GetFileSize(void)
 	{
         MCStringCreateWithCFString((CFStringRef)NSHomeDirectory() , &t_path);
 	}
-	else if (MCNameIsEqualToCString(p_type, "cache", kMCCompareCaseless))
+	else if (MCStringIsEqualToCString(MCNameGetString(p_type), "cache", kMCCompareCaseless))
 	{
 		NSArray *t_paths;
         t_paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
@@ -716,7 +716,7 @@ virtual uint64_t GetFileSize(void)
         /* UNCHECKED */ MCStringCopySubstring(MCcmd, MCRangeMake(0, t_index), &t_path);
                     
 	}
-	else if (MCNameIsEqualToCString(p_type, "library", kMCCompareCaseless))
+	else if (MCStringIsEqualToCString(MCNameGetString(p_type), "library", kMCCompareCaseless))
 	{
 		NSArray *t_paths;
 		t_paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
diff --git a/engine/src/mcio.cpp b/engine/src/mcio.cpp
@@ -114,9 +114,9 @@ void IO_cleanprocesses()
 				MCPlayerHandle t_player = MCplayers;
 				while (t_player.IsValid())
 				{
-					if (MCNameIsEqualToCString(MCprocesses[i].name,
-                                               t_player->getcommand(),
-                                               kMCCompareExact))
+					if (MCStringIsEqualToCString(MCNameGetString(MCprocesses[i].name),
+                                                 t_player->getcommand(),
+                                                 kMCCompareExact))
 					{
 						t_player->playstop(); // removes from linked list
 						break;

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static Exec_stat MCBitmapEffectLookupProperty(MCBitmapEffectType p_type, MCNameR`
`92`	`92`	`for(uint4 i = 0; i < ELEMENTS(s_bitmap_effect_properties); i++)`
`93`	`93`	`{`
`94`	`94`	`// Check to see if we've found a match.`
`95`		`- if (MCNameIsEqualToCString(p_token, s_bitmap_effect_properties[i] . token, kMCCompareCaseless))`
	`95`	`+ if (MCStringIsEqualToCString(MCNameGetString(p_token), s_bitmap_effect_properties[i] . token, kMCCompareCaseless))`
`96`	`96`	`{`
`97`	`97`	`// Check to see if its applicable to this type.`
`98`	`98`	`if ((s_bitmap_effect_properties[i] . mask & (1 << p_type)) != 0)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static Exec_stat MCGradientFillLookupProperty(MCNameRef p_token, MCGradientFillP`
`63`	`63`	`uint4 tablesize = ELEMENTS(gradientprops);`
`64`	`64`	`while (tablesize--)`
`65`	`65`	`{`
`66`		`- if (MCNameIsEqualToCString(p_token, gradientprops[tablesize].token, kMCCompareCaseless))`
	`66`	`+ if (MCStringIsEqualToCString(MCNameGetString(p_token), gradientprops[tablesize].token, kMCCompareCaseless))`
`67`	`67`	`{`
`68`	`68`	`r_prop = gradientprops[tablesize].value;`
`69`	`69`	`return ES_NORMAL;`
Original file line number	Diff line number	Diff line change
`@@ -4605,7 +4605,7 @@ bool MCIsPlatformMessage(MCNameRef handler_name)`
`4605`	`4605`
`4606`	`4606`	`for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)`
`4607`	`4607`	`{`
`4608`		`- if (MCNameIsEqualToCString(handler_name, s_platform_messages[i].message, kMCCompareCaseless))`
	`4608`	`+ if (MCStringIsEqualToCString(MCNameGetString(handler_name), s_platform_messages[i].message, kMCCompareCaseless))`
`4609`	`4609`	`found = true;`
`4610`	`4610`	`}`
`4611`	`4611`
`@@ -4662,7 +4662,7 @@ bool MCDoHandlePlatformMessage(bool p_waitable, MCPlatformMessageHandler p_handl`
`4662`	`4662`	`bool MCHandlePlatformMessage(MCNameRef p_message, MCParameter *p_parameters, Exec_stat& r_result)`
`4663`	`4663`	`{`
`4664`	`4664`	`for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)`
`4665`		`- if (MCNameIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareCaseless))`
	`4665`	`+ if (MCStringIsEqualToCString(MCNameGetString(p_message), s_platform_messages[i] . message, kMCCompareCaseless))`
`4666`	`4666`	`{`
`4667`	`4667`	`return MCDoHandlePlatformMessage(s_platform_messages[i] . waitable, s_platform_messages[i] . handler, s_platform_messages[i] . context, p_parameters, r_result);`
`4668`	`4668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ virtual uint64_t GetFileSize(void)`
`698`	`698`	`{`
`699`	`699`	`MCStringCreateWithCFString((CFStringRef)NSHomeDirectory() , &t_path);`
`700`	`700`	`}`
`701`		`- else if (MCNameIsEqualToCString(p_type, "cache", kMCCompareCaseless))`
	`701`	`+ else if (MCStringIsEqualToCString(MCNameGetString(p_type), "cache", kMCCompareCaseless))`
`702`	`702`	`{`
`703`	`703`	`NSArray *t_paths;`
`704`	`704`	`t_paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);`
`@@ -716,7 +716,7 @@ virtual uint64_t GetFileSize(void)`
`716`	`716`	`/* UNCHECKED */ MCStringCopySubstring(MCcmd, MCRangeMake(0, t_index), &t_path);`
`717`	`717`
`718`	`718`	`}`
`719`		`- else if (MCNameIsEqualToCString(p_type, "library", kMCCompareCaseless))`
	`719`	`+ else if (MCStringIsEqualToCString(MCNameGetString(p_type), "library", kMCCompareCaseless))`
`720`	`720`	`{`
`721`	`721`	`NSArray *t_paths;`
`722`	`722`	`t_paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ void IO_cleanprocesses()`
`114`	`114`	`MCPlayerHandle t_player = MCplayers;`
`115`	`115`	`while (t_player.IsValid())`
`116`	`116`	`{`
`117`		`- if (MCNameIsEqualToCString(MCprocesses[i].name,`
`118`		`- t_player->getcommand(),`
`119`		`- kMCCompareExact))`
	`117`	`+ if (MCStringIsEqualToCString(MCNameGetString(MCprocesses[i].name),`
	`118`	`+ t_player->getcommand(),`
	`119`	`+ kMCCompareExact))`
`120`	`120`	`{`
`121`	`121`	`t_player->playstop(); // removes from linked list`
`122`	`122`	`break;`