diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-22 17:46:29 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-22 17:46:29 +0200 |
| commit | 5b2da9482870c6e5d1fc8ad90c9801647ad28171 (patch) | |
| tree | bd40196e93ca7d7b2a69389438d20cf46c49f43b /gcc | |
| parent | f5e811d59797b6b3e56e69bd48331e1bc15af6ed (diff) | |
| download | gcc-5b2da9482870c6e5d1fc8ad90c9801647ad28171.zip gcc-5b2da9482870c6e5d1fc8ad90c9801647ad28171.tar.gz gcc-5b2da9482870c6e5d1fc8ad90c9801647ad28171.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 19 | ||||
| -rw-r--r-- | gcc/ada/s-wwdcha.adb | 41 |
2 files changed, 30 insertions, 30 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7d2d66f..44f150f 100644 --- 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 3580a01..6f2d1ce 100644 --- 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; |