From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 14 Sep 2007 08:05:19 +0000 (+0000)
Subject: 	* src/Encoding.cpp (read): silence a compiler warning.
X-Git-Tag: 1.6.10~8353
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a546691ca3ed1ff05d0b20ec325346c08d79d772;p=features.git

	* src/Encoding.cpp (read): silence a compiler warning.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20275 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index ae03c09b48..c6441f1dc0 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -519,20 +519,19 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 			string const iconvname = lex.getString();
 			lex.next();
 			string const width = lex.getString();
-			bool fixedwidth;;
+			bool fixedwidth = false;
 			if (width == "fixed")
 				fixedwidth = true;
 			else if (width == "variable")
 				fixedwidth = false;
 			else {
-                                fixedwidth = false;
 				lex.printError("Encodings::read: "
 					       "Unknown width: `$$Token'");
                         }
                         
 			lex.next();
 			string const p = lex.getString();
-			Encoding::Package package;
+			Encoding::Package package = Encoding::none;
 			if (p == "none")
                                 package = Encoding::none;
 			else if (p == "inputenc")
@@ -540,7 +539,6 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 			else if (p == "CJK")
 				package = Encoding::CJK;
 			else {
-                                package = Encoding::none;
 				lex.printError("Encodings::read: "
 					       "Unknown package: `$$Token'");
                         }