s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

[deliverable/binutils-gdb.git] / binutils / bucomm.c

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 68b191b72101a8149208e11fe948020fbd24e1d5..9609aeece77c18ae595bb997866f93497dd5a5ce 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,5 +1,5 @@
 /* bucomm.c -- Bin Utils COMmon code.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -35,9 +35,6 @@
 typedef long time_t;
 #endif
 #endif
-
-/* Ought to be defined in libiberty.h...  */
-extern int mkstemps PARAMS ((char *, int));
 \f
 /* Error reporting */
 
@@ -45,9 +42,9 @@ char *program_name;
 
 void
 bfd_nonfatal (string)
-     CONST char *string;
+     const char *string;
 {
-  CONST char *errmsg = bfd_errmsg (bfd_get_error ());
+  const char *errmsg = bfd_errmsg (bfd_get_error ());
 
   if (string)
     fprintf (stderr, "%s: %s: %s\n", program_name, string, errmsg);
@@ -57,7 +54,7 @@ bfd_nonfatal (string)
 
 void
 bfd_fatal (string)
-     CONST char *string;
+     const char *string;
 {
   bfd_nonfatal (string);
   xexit (1);
@@ -110,7 +107,7 @@ set_default_bfd_target ()
           target, bfd_errmsg (bfd_get_error ()));
 }
 
-/* After a false return from bfd_check_format_matches with
+/* After a FALSE return from bfd_check_format_matches with
    bfd_get_error () == bfd_error_file_ambiguously_recognized, print
    the possible matching targets.  */
 
@@ -131,16 +128,18 @@ list_supported_targets (name, f)
      const char *name;
      FILE *f;
 {
-  extern const bfd_target *const *bfd_target_vector;
   int t;
+  const char **targ_names = bfd_target_list ();
 
   if (name == NULL)
     fprintf (f, _("Supported targets:"));
   else
     fprintf (f, _("%s: supported targets:"), name);
-  for (t = 0; bfd_target_vector[t] != NULL; t++)
-    fprintf (f, " %s", bfd_target_vector[t]->name);
+
+  for (t = 0; targ_names[t] != NULL; t++)
+    fprintf (f, " %s", targ_names[t]);
   fprintf (f, "\n");
+  free (targ_names);
 }
 
 /* List the supported architectures.  */
@@ -150,7 +149,7 @@ list_supported_architectures (name, f)
      const char *name;
      FILE *f;
 {
-  const char** arch;
+  const char **arch;
 
   if (name == NULL)
     fprintf (f, _("Supported architectures:"));
@@ -170,7 +169,7 @@ void
 print_arelt_descr (file, abfd, verbose)
      FILE *file;
      bfd *abfd;
-     boolean verbose;
+     bfd_boolean verbose;
 {
   struct stat buf;
 
@@ -181,7 +180,7 @@ print_arelt_descr (file, abfd, verbose)
          char modebuf[11];
          char timebuf[40];
          time_t when = buf.st_mtime;
-         CONST char *ctime_result = (CONST char *) ctime (&when);
+         const char *ctime_result = (const char *) ctime (&when);
 
          /* POSIX format:  skip weekday and seconds from ctime output.  */
          sprintf (timebuf, "%.12s %.4s", ctime_result + 4, ctime_result + 20);
@@ -236,14 +235,14 @@ make_tempname (filename)
 #endif
       strcat (tmpname, "/");
       strcat (tmpname, template);
-      close (mkstemps (tmpname, 0));
+      mktemp (tmpname);
       *slash = c;
     }
   else
     {
       tmpname = xmalloc (sizeof (template));
       strcpy (tmpname, template);
-      close (mkstemps (tmpname, 0));
+      mktemp (tmpname);
     }
   return tmpname;
 }
@@ -260,7 +259,7 @@ parse_vma (s, arg)
   const char *end;
 
   ret = bfd_scan_vma (s, &end, 0);
-  
+
   if (*end != '\0')
     fatal (_("%s: bad number: %s"), arg, s);