From 5f8abbd98b87a4dd80586a164d7f3b8eb81aa691 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Wed, 8 Dec 2004 12:46:30 +0100 Subject: gnatmem.adb, [...]: Output the copyright message on a separate line from the version message. * gnatmem.adb, gnatname.adb, gnatsym.adb, gprcmd.adb, vms_conv.adb: Output the copyright message on a separate line from the version message. From-SVN: r91885 --- gcc/ada/gnatmem.adb | 5 ++--- gcc/ada/gnatname.adb | 4 ++-- gcc/ada/gnatsym.adb | 3 ++- gcc/ada/gprcmd.adb | 5 ++--- gcc/ada/vms_conv.adb | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/gnatmem.adb b/gcc/ada/gnatmem.adb index 1b69183..f2a1377 100644 --- a/gcc/ada/gnatmem.adb +++ b/gcc/ada/gnatmem.adb @@ -55,7 +55,6 @@ with Gnatvsn; use Gnatvsn; - with Ada.Text_IO; use Ada.Text_IO; with Ada.Float_Text_IO; with Ada.Integer_Text_IO; @@ -233,8 +232,8 @@ procedure Gnatmem is begin New_Line; Put ("GNATMEM "); - Put (Gnat_Version_String); - Put_Line (" Copyright 1997-2004 Free Software Foundation, Inc."); + Put_Line (Gnat_Version_String); + Put_Line ("Copyright 1997-2004 Free Software Foundation, Inc."); New_Line; Put_Line ("Usage: gnatmem switches [depth] exename"); diff --git a/gcc/ada/gnatname.adb b/gcc/ada/gnatname.adb index b38fac0..bdce127 100644 --- a/gcc/ada/gnatname.adb +++ b/gcc/ada/gnatname.adb @@ -170,9 +170,9 @@ procedure Gnatname is Version_Output := True; Output.Write_Eol; Output.Write_Str ("GNATNAME "); - Output.Write_Str (Gnatvsn.Gnat_Version_String); + Output.Write_Line (Gnatvsn.Gnat_Version_String); Output.Write_Line - (" Copyright 2001-2004 Free Software Foundation, Inc."); + ("Copyright 2001-2004 Free Software Foundation, Inc."); end if; end Output_Version; diff --git a/gcc/ada/gnatsym.adb b/gcc/ada/gnatsym.adb index f639f43..790ff40 100644 --- a/gcc/ada/gnatsym.adb +++ b/gcc/ada/gnatsym.adb @@ -111,7 +111,8 @@ procedure Gnatsym is Write_Eol; Write_Str ("GNATSYMB "); Write_Str (Gnat_Version_String); - Write_Str (" Copyright 2003-2004 Free Software Foundation, Inc"); + Write_Eol; + Write_Str ("Copyright 2003-2004 Free Software Foundation, Inc"); Write_Eol; Copyright_Displayed := True; end if; diff --git a/gcc/ada/gprcmd.adb b/gcc/ada/gprcmd.adb index 64bc74f..143b62b 100644 --- a/gcc/ada/gprcmd.adb +++ b/gcc/ada/gprcmd.adb @@ -53,7 +53,6 @@ with GNAT.OS_Lib; use GNAT.OS_Lib; with GNAT.Directory_Operations; use GNAT.Directory_Operations; with GNAT.Regpat; use GNAT.Regpat; - procedure Gprcmd is -- ??? comments are thin throughout this unit @@ -398,9 +397,9 @@ begin -- go to standard output. Put (Standard_Error, "GPRCMD "); - Put (Standard_Error, Gnatvsn.Gnat_Version_String); + Put_Line (Standard_Error, Gnatvsn.Gnat_Version_String); Put_Line (Standard_Error, - " Copyright 2002-2004, Free Software Fundation, Inc."); + "Copyright 2002-2004, Free Software Fundation, Inc."); Usage; elsif Cmd = "pwd" then diff --git a/gcc/ada/vms_conv.adb b/gcc/ada/vms_conv.adb index fc92443..f623727 100644 --- a/gcc/ada/vms_conv.adb +++ b/gcc/ada/vms_conv.adb @@ -661,8 +661,8 @@ package body VMS_Conv is procedure Output_Version is begin Put ("GNAT "); - Put (Gnatvsn.Gnat_Version_String); - Put_Line (" Copyright 1996-2004 Free Software Foundation, Inc."); + Put_Line (Gnatvsn.Gnat_Version_String); + Put_Line ("Copyright 1996-2004 Free Software Foundation, Inc."); end Output_Version; ----------- -- cgit v1.1