From 001ee5124201d23d5b0558c9cb0575d11dedfc5f Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Fri, 25 Jan 2013 17:22:23 -0500 Subject: [PATCH] replace gotos with tail calls where appropriate --- src/NoteSkinManager.cpp | 5 ++--- src/ThemeManager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/NoteSkinManager.cpp b/src/NoteSkinManager.cpp index 8815c414bc..ec67bbaf4f 100644 --- a/src/NoteSkinManager.cpp +++ b/src/NoteSkinManager.cpp @@ -274,7 +274,6 @@ apActorCommands NoteSkinManager::GetMetricA( const RString &sButtonName, const R RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sElement ) { -try_again: const RString CacheString = m_sCurrentNoteSkin + "/" + sButtonName + "/" + sElement; map::iterator it = g_PathCache.find( CacheString ); if( it != g_PathCache.end() ) @@ -327,7 +326,7 @@ try_again: FOREACH_CONST( RString, data.vsDirSearchOrder, dir ) FILEMAN->FlushDirCache( *dir ); g_PathCache.clear(); - goto try_again; + return GetPath( sButtonName, sElement ); } RageException::Throw( "%s", message.c_str() ); @@ -362,7 +361,7 @@ try_again: FOREACH_CONST( RString, data.vsDirSearchOrder, dir ) FILEMAN->FlushDirCache( *dir ); g_PathCache.clear(); - goto try_again; + return GetPath( sButtonName, sElement ); } RageException::Throw( "%s", message.c_str() ); diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp index c61a941ef3..4a390ea901 100644 --- a/src/ThemeManager.cpp +++ b/src/ThemeManager.cpp @@ -668,7 +668,7 @@ try_element_again: break; case Dialog::retry: ReloadMetrics(); - goto try_element_again; + return GetPathInfoToRaw( out, sThemeName_, category, sMetricsGroup_, sElement_ ); case Dialog::ignore: break; } @@ -710,7 +710,7 @@ try_element_again: { case Dialog::retry: ReloadMetrics(); - goto try_element_again; + return GetPathInfoToRaw( out, sThemeName_, category, sMetricsGroup_, sElement_ ); case Dialog::ignore: GetPathInfo( out, category, "", "_missing" ); return true;