s-wwdcha.adb: Minor code reorganization Remove dead code

2008-08-22  Robert Dewar  <dewar@adacore.com>

	* s-wwdcha.adb: Minor code reorganization
	Remove dead code

From-SVN: r139490

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7d2d66f83a7a4d53d6f81113da4a4fa75cf6b8e1..44f150fc37051fdf7d054558023a67811397f799 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,22 @@
+2008-08-22  Arnaud Charlet  <charlet@adacore.com>
+
+       * lib-xref.ads: Fix typo in subprogram reference definition.
+
+2008-08-22  Robert Dewar  <dewar@adacore.com>
+
+       * s-sopco3.adb: Minor code fix to avoid warning
+
+       * s-sopco4.adb: Minor code fix to avoid warning
+
+       * s-sopco5.adb: Minor code fix to avoid warning
+
+       * s-strops.adb: Minor code fix to avoid warning
+
+       * s-utf_32.adb (Get_Category): Fix obvious typo
+
+       * s-wwdcha.adb: Minor code reorganization
+       Remove dead code
+
 2008-08-22  Robert Dewar  <dewar@adacore.com>
 
        * checks.adb (Determine_Range): Deal with values that might be invalid

diff --git a/gcc/ada/s-wwdcha.adb b/gcc/ada/s-wwdcha.adb
index 3580a0142f5f531183eea3d1e5372995bfb4c3de..6f2d1ceedd282a3bf2582dbea91cebdfb2374616 100644 (file)
--- a/gcc/ada/s-wwdcha.adb
+++ b/gcc/ada/s-wwdcha.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2008, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -43,20 +43,11 @@ package body System.WWd_Char is
    begin
       W := 0;
       for C in Lo .. Hi loop
-         --  For Character range, use length of image
-
-         if Character'Pos (C) < 256 then
-            declare
-               S : constant Wide_String := Character'Wide_Image (C);
-            begin
-               W := Natural'Max (W, S'Length);
-            end;
-
-            --  For wide character, always max out at 12 (Hex_hhhhhhhh)
-
-         else
-            return 12;
-         end if;
+         declare
+            S : constant Wide_String := Character'Wide_Image (C);
+         begin
+            W := Natural'Max (W, S'Length);
+         end;
       end loop;
 
       return W;
@@ -72,21 +63,11 @@ package body System.WWd_Char is
    begin
       W := 0;
       for C in Lo .. Hi loop
-
-         --  For Character range, use length of image
-
-         if Character'Pos (C) < 256 then
-            declare
-               S : constant String := Character'Image (C);
-            begin
-               W := Natural'Max (W, S'Length);
-            end;
-
-            --  For wide character, always max out at 12 (Hex_hhhhhhhh)
-
-         else
-            return 12;
-         end if;
+         declare
+            S : constant String := Character'Image (C);
+         begin
+            W := Natural'Max (W, S'Length);
+         end;
       end loop;
 
       return W;