Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 18 insertions, 30 deletions

diff --git a/contrib/gcc/f/stc.c b/contrib/gcc/f/stc.c
index b89b7472d57d..1f17766d9ac0 100644
--- a/contrib/gcc/f/stc.c
+++ b/contrib/gcc/f/stc.c
@@ -1,5 +1,5 @@
 /* stc.c -- Implementation File (module.c template V1.0)
-   Copyright (C) 1995-1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
 This file is part of GNU Fortran.
@@ -339,8 +339,8 @@ static void ffestc_shriek_where_ (bool ok);
 #if FFESTR_F90
 static void ffestc_shriek_wherethen_ (bool ok);
 #endif
-static int ffestc_subr_binsrch_ (const char **list, int size, ffestpFile *spec,
-				 const char *whine);
+static int ffestc_subr_binsrch_ (const char *const *list, int size,
+				 ffestpFile *spec, const char *whine);
 static ffestvFormat ffestc_subr_format_ (ffestpFile *spec);
 static bool ffestc_subr_is_branch_ (ffestpFile *spec);
 static bool ffestc_subr_is_format_ (ffestpFile *spec);
@@ -5044,7 +5044,8 @@ ffestc_shriek_wherethen_ (bool ok)
    using "etc" as the pick-one-of-these string.	 */
 
 static int
-ffestc_subr_binsrch_ (const char **list, int size, ffestpFile *spec, const char *whine)
+ffestc_subr_binsrch_ (const char *const *list, int size, ffestpFile *spec,
+		      const char *whine)
 {
   int lowest_tested;
   int highest_tested;
@@ -10202,8 +10203,7 @@ ffestc_R904 ()
 {
   int i;
   int expect_file;
-  const char *status_strs[]
-  =
+  static const char *const status_strs[] =
   {
     "New",
     "Old",
@@ -10211,29 +10211,25 @@ ffestc_R904 ()
     "Scratch",
     "Unknown"
   };
-  const char *access_strs[]
-  =
+  static const char *const access_strs[] =
   {
     "Append",
     "Direct",
     "Keyed",
     "Sequential"
   };
-  const char *blank_strs[]
-  =
+  static const char *const blank_strs[] =
   {
     "Null",
     "Zero"
   };
-  const char *carriagecontrol_strs[]
-  =
+  static const char *const carriagecontrol_strs[] =
   {
     "Fortran",
     "List",
     "None"
   };
-  const char *dispose_strs[]
-  =
+  static const char *const dispose_strs[] =
   {
     "Delete",
     "Keep",
@@ -10243,42 +10239,36 @@ ffestc_R904 ()
     "Submit",
     "Submit/Delete"
   };
-  const char *form_strs[]
-  =
+  static const char *const form_strs[] =
   {
     "Formatted",
     "Unformatted"
   };
-  const char *organization_strs[]
-  =
+  static const char *const organization_strs[] =
   {
     "Indexed",
     "Relative",
     "Sequential"
   };
-  const char *position_strs[]
-  =
+  static const char *const position_strs[] =
   {
     "Append",
     "AsIs",
     "Rewind"
   };
-  const char *action_strs[]
-  =
+  static const char *const action_strs[] =
   {
     "Read",
     "ReadWrite",
     "Write"
   };
-  const char *delim_strs[]
-  =
+  static const char *const delim_strs[] =
   {
     "Apostrophe",
     "None",
     "Quote"
   };
-  const char *recordtype_strs[]
-  =
+  static const char *const recordtype_strs[] =
   {
     "Fixed",
     "Segmented",
@@ -10287,8 +10277,7 @@ ffestc_R904 ()
     "Stream_LF",
     "Variable"
   };
-  const char *pad_strs[]
-  =
+  static const char *const pad_strs[] =
   {
     "No",
     "Yes"
@@ -10457,8 +10446,7 @@ ffestc_R904 ()
 void
 ffestc_R907 ()
 {
-  const char *status_strs[]
-  =
+  static const char *const status_strs[] =
   {
     "Delete",
     "Keep",