g-stheme.adb, [...] (Host_Error_Message): Return a string...

[gcc.git] / gcc / ada / g-stheme.adb

diff --git a/gcc/ada/g-stheme.adb b/gcc/ada/g-stheme.adb
index f3f283f0ac467d78c76e6f0bde492a5830bf54a9..ceccba0ba01c86a47f8a9c62441a9db4513a1436 100644 (file)
--- a/gcc/ada/g-stheme.adb
+++ b/gcc/ada/g-stheme.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2007-2010, AdaCore                     --
+--                     Copyright (C) 2007-2013, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -36,38 +36,19 @@
 separate (GNAT.Sockets.Thin)
 package body Host_Error_Messages is
 
-   package Messages is
-      HOST_NOT_FOUND : aliased char_array := "Host not found" & nul;
-      TRY_AGAIN      : aliased char_array := "Try again"      & nul;
-      NO_RECOVERY    : aliased char_array := "No recovery"    & nul;
-      NO_DATA        : aliased char_array := "No address"     & nul;
-      Unknown_Error  : aliased char_array := "Unknown error"  & nul;
-   end Messages;
-
-   function Host_Error_Message (H_Errno : Integer) return C.Strings.chars_ptr
-   is
-      use Interfaces.C.Strings;
-      function TCP
-        (P : char_array_access; Nul_Check : Boolean := False) return chars_ptr
-         renames To_Chars_Ptr;
-
+   function Host_Error_Message (H_Errno : Integer) return String is
    begin
       case H_Errno is
          when SOSC.HOST_NOT_FOUND =>
-            return TCP (Messages.HOST_NOT_FOUND'Access);
-
+            return "Host not found";
          when SOSC.TRY_AGAIN      =>
-            return TCP (Messages.TRY_AGAIN'Access);
-
+            return "Try again";
          when SOSC.NO_RECOVERY    =>
-            return TCP (Messages.NO_RECOVERY'Access);
-
+            return "No recovery";
          when SOSC.NO_DATA        =>
-            return TCP (Messages.NO_DATA'Access);
-
+            return "No address";
          when others              =>
-            return TCP (Messages.Unknown_Error'Access);
-
+            return "Unknown error";
       end case;
    end Host_Error_Message;