2004-09-16 Sebastien Pouliot <sebastien@ximian.com>

	* MiniParser.cs: Fixed warning (l4) for unused variables. Removed
	duplicate (and identical) license.

svn path=/trunk/mcs/; revision=33989

diff --git a/mcs/class/corlib/Mono.Xml/ChangeLog b/mcs/class/corlib/Mono.Xml/ChangeLog
index 8202d01b45e400936a805c073d077b3bf898026c..ae2ff081612626f8d7fad1029753707921b99c2d 100644 (file)
--- a/mcs/class/corlib/Mono.Xml/ChangeLog
+++ b/mcs/class/corlib/Mono.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-16  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * MiniParser.cs: Fixed warning (l4) for unused variables. Removed
+       duplicate (and identical) license.
+
 2004-05-14  Marek Safar  <marek.safar@seznam.cz>
 
        * MiniParser.cs, SecurityParser.cs: [CLSCompliant (false)]

diff --git a/mcs/class/corlib/Mono.Xml/MiniParser.cs b/mcs/class/corlib/Mono.Xml/MiniParser.cs
index 65652aa03164467189a6b5f22e4a4f5ea20e8135..c155737bcd9c126e91a05e16ed4b6514c72dc01f 100644 (file)
--- a/mcs/class/corlib/Mono.Xml/MiniParser.cs
+++ b/mcs/class/corlib/Mono.Xml/MiniParser.cs
@@ -4,8 +4,8 @@
 // Authors:
 //     Sergey Chaban
 //
-
-//
+// Copyright (c) 2001, 2002 Wild West Software
+// Copyright (c) 2002 Sergey Chaban
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -28,30 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-/*
- * Copyright (c) 2001, 2002 Wild West Software
- * Copyright (c) 2002 Sergey Chaban
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 using System;
 using System.Text;
 using System.Collections;
@@ -357,7 +333,6 @@ class MiniParser {
 
                while (true) {
                        ++this.col;
-                       int prevCh = currCh;
 
                        currCh = reader.Read();
 
@@ -584,7 +559,6 @@ class MiniParser {
 
                                                int pos = 0;
                                                int entIdx = 0xF;
-                                               int pred = 0;
                                                int predShift = 0;
 
                                                int sbLen = sbChars.Length;
@@ -604,11 +578,11 @@ class MiniParser {
                                                        pos = 0xF;
                                                        if (lBr != 0xF && currCh == entityRefChars[lBr]) {
                                                                if (lPred < 0xE) entIdx = lPred;
-                                                               pred = lPred;
+//                                                             pred = lPred;
                                                                predShift = 12; // left
                                                        } else if (rBr != 0xF && currCh == entityRefChars[rBr]) {
                                                                if (rPred < 0xE) entIdx = rPred;
-                                                               pred = rPred;
+//                                                             pred = rPred;
                                                                predShift = 8; // right
                                                        } else if (currCh == ';') {
                                                                if (entIdx != 0xF