From e3548b69ad7ce76aa9e9aecf6a707ab0f88114ae Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Wed, 14 Nov 2018 11:40:20 +0000 Subject: [PATCH] [Ada] Use Cancel_Special_Output instead of Set_Special_Output with null I believe Cancel_Special_Output is easier to read and thus preferred; otherwise, it wouldn't be introduced, so let's use it where possible. 2018-11-14 Piotr Trojanek gcc/ada/ * bindgen.adb, exp_cg.adb, repinfo.adb, sprint.adb: Minor reuse Cancel_Special_Output where possible. From-SVN: r266110 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/bindgen.adb | 2 +- gcc/ada/exp_cg.adb | 2 +- gcc/ada/repinfo.adb | 2 +- gcc/ada/sprint.adb | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d760f805f88..26ffdfc9394 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-11-14 Piotr Trojanek + + * bindgen.adb, exp_cg.adb, repinfo.adb, sprint.adb: Minor reuse + Cancel_Special_Output where possible. + 2018-11-14 Piotr Trojanek * exp_dbug.ads, sem_util.ads: Minor fixes in comments. diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index 4b4e2bb77b8..27227a6579d 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -1186,7 +1186,7 @@ package body Bindgen is end loop; WBI (" & ASCII.NUL;"); - Set_Special_Output (null); + Cancel_Special_Output; Bind_Env_String_Built := True; end Gen_Bind_Env_String; diff --git a/gcc/ada/exp_cg.adb b/gcc/ada/exp_cg.adb index f40dc7e9c2a..0c6e08b02e5 100644 --- a/gcc/ada/exp_cg.adb +++ b/gcc/ada/exp_cg.adb @@ -146,7 +146,7 @@ package body Exp_CG is end if; end loop; - Set_Special_Output (null); + Cancel_Special_Output; end Generate_CG_Output; ---------------- diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb index e75bb1d5d69..2a0d568777b 100644 --- a/gcc/ada/repinfo.adb +++ b/gcc/ada/repinfo.adb @@ -1756,7 +1756,7 @@ package body Repinfo is (Get_Name_String (File_Name (Source_Index (U)))); Set_Special_Output (Write_Info_Line'Access); List_Entities (Cunit_Entity (U), Bytes_Big_Endian); - Set_Special_Output (null); + Cancel_Special_Output; Close_Repinfo_File_Access.all; end if; end if; diff --git a/gcc/ada/sprint.adb b/gcc/ada/sprint.adb index ab7eecb7257..a1dbb3cabfc 100644 --- a/gcc/ada/sprint.adb +++ b/gcc/ada/sprint.adb @@ -660,7 +660,7 @@ package body Sprint is Write_Source_Lines (Last_Source_Line (Current_Source_File)); Write_Eol; Close_Debug_Source; - Set_Special_Output (null); + Cancel_Special_Output; -- Normal output to standard output file -- 2.30.2