X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Ftool%2Fmain.cpp;h=8141c0095f37739cc839d65636fc2b1d1e7e2a80;hb=563c0b4883cce4c1a73a496b0fa585e9daa8ff80;hp=387670d8f0481ec2045592ad43a0a68d451a64ac;hpb=87ce9c04e961b241578e159b813c8b2f338d813b;p=synfig.git

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 387670d..8141c00 100644
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -58,16 +59,16 @@ using namespace synfig;
 
 enum exit_code
 {
-	SYNFIGTOOL_OK				=0,
-	SYNFIGTOOL_FILENOTFOUND		=1,
-	SYNFIGTOOL_BORRED			=2,
-	SYNFIGTOOL_HELP				=3,
-	SYNFIGTOOL_UNKNOWNARGUMENT	=4,
-	SYNFIGTOOL_UNKNOWNERROR		=5,
-	SYNFIGTOOL_INVALIDTARGET		=6,
-	SYNFIGTOOL_RENDERFAILURE		=7,
-	SYNFIGTOOL_BLANK				=8,
-	SYNFIGTOOL_BADVERSION		=9,
+	SYNFIGTOOL_OK				= 0,
+	SYNFIGTOOL_FILENOTFOUND		= 1,
+	SYNFIGTOOL_BORED			= 2,
+	SYNFIGTOOL_HELP				= 3,
+	SYNFIGTOOL_UNKNOWNARGUMENT	= 4,
+	SYNFIGTOOL_UNKNOWNERROR		= 5,
+	SYNFIGTOOL_INVALIDTARGET	= 6,
+	SYNFIGTOOL_RENDERFAILURE	= 7,
+	SYNFIGTOOL_BLANK			= 8,
+	SYNFIGTOOL_BADVERSION		= 9,
 	SYNFIGTOOL_MISSINGARGUMENT	=10
 };
 
@@ -122,7 +123,7 @@ public:
 	}
 
 	virtual bool
-	amount_complete(int current, int total)
+	amount_complete(int /*current*/, int /*total*/)
 	{
 		return true;
 	}
@@ -955,19 +956,14 @@ int main(int argc, char *argv[])
 			// If the target type is not yet defined,
 			// try to figure it out from the outfile.
 			if(target_name.empty() && !job_list.front().outfilename.empty())
-			try
 			{
 				VERBOSE_OUT(3)<<_("Target name undefined, attempting to figure it out")<<endl;
-				string ext=string(find(job_list.front().outfilename.begin(),job_list.front().outfilename.end(),'.')+1,job_list.front().outfilename.end());
+				string ext=job_list.front().outfilename.substr(job_list.front().outfilename.rfind('.')+1);
 				if(Target::ext_book().count(ext))
 					target_name=Target::ext_book()[ext];
 				else
 					target_name=ext;
 			}
-			catch(std::length_error)
-			{
-				synfig::warning("Length error caught when attempting to figure out target name");
-			}
 
 			// If the target type is STILL not yet defined, then
 			// set it to a some sort of default
@@ -1055,7 +1051,7 @@ int main(int argc, char *argv[])
 	if(!job_list.size())
 	{
 		cerr<<_("Nothing to do!")<<endl;
-		return SYNFIGTOOL_BORRED;
+		return SYNFIGTOOL_BORED;
 	}
 
 	for(;job_list.size();job_list.pop_front())