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

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

1 files changed, 106 insertions, 106 deletions

diff --git a/ld/ldmain.c b/ld/ldmain.c
index ef7b442..8b7c2f9 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -75,62 +75,62 @@ bfd *output_bfd = 0;
 int g_switch_value = 8;
 
 /* Nonzero means print names of input files as processed.  */
-boolean trace_files;
+bfd_boolean trace_files;
 
 /* Nonzero means same, but note open failures, too.  */
-boolean trace_file_tries;
+bfd_boolean trace_file_tries;
 
 /* Nonzero means version number was printed, so exit successfully
    instead of complaining if no input files are given.  */
-boolean version_printed;
+bfd_boolean version_printed;
 
 /* Nonzero means link in every member of an archive.  */
-boolean whole_archive;
+bfd_boolean whole_archive;
 
-/* True if we should demangle symbol names.  */
-boolean demangling;
+/* TRUE if we should demangle symbol names.  */
+bfd_boolean demangling;
 
 args_type command_line;
 
 ld_config_type config;
 
 static void remove_output PARAMS ((void));
-static boolean check_for_scripts_dir PARAMS ((char *dir));
-static boolean add_archive_element PARAMS ((struct bfd_link_info *, bfd *,
+static bfd_boolean check_for_scripts_dir PARAMS ((char *dir));
+static bfd_boolean add_archive_element PARAMS ((struct bfd_link_info *, bfd *,
 					    const char *));
-static boolean multiple_definition PARAMS ((struct bfd_link_info *,
+static bfd_boolean multiple_definition PARAMS ((struct bfd_link_info *,
 					    const char *,
 					    bfd *, asection *, bfd_vma,
 					    bfd *, asection *, bfd_vma));
-static boolean multiple_common PARAMS ((struct bfd_link_info *,
+static bfd_boolean multiple_common PARAMS ((struct bfd_link_info *,
 					const char *, bfd *,
 					enum bfd_link_hash_type, bfd_vma,
 					bfd *, enum bfd_link_hash_type,
 					bfd_vma));
-static boolean add_to_set PARAMS ((struct bfd_link_info *,
+static bfd_boolean add_to_set PARAMS ((struct bfd_link_info *,
 				   struct bfd_link_hash_entry *,
 				   bfd_reloc_code_real_type,
 				   bfd *, asection *, bfd_vma));
-static boolean constructor_callback PARAMS ((struct bfd_link_info *,
-					     boolean constructor,
+static bfd_boolean constructor_callback PARAMS ((struct bfd_link_info *,
+					     bfd_boolean constructor,
 					     const char *name,
 					     bfd *, asection *, bfd_vma));
-static boolean warning_callback PARAMS ((struct bfd_link_info *,
+static bfd_boolean warning_callback PARAMS ((struct bfd_link_info *,
 					 const char *, const char *, bfd *,
 					 asection *, bfd_vma));
 static void warning_find_reloc PARAMS ((bfd *, asection *, PTR));
-static boolean undefined_symbol PARAMS ((struct bfd_link_info *,
+static bfd_boolean undefined_symbol PARAMS ((struct bfd_link_info *,
 					 const char *, bfd *,
-					 asection *, bfd_vma, boolean));
-static boolean reloc_overflow PARAMS ((struct bfd_link_info *, const char *,
+					 asection *, bfd_vma, bfd_boolean));
+static bfd_boolean reloc_overflow PARAMS ((struct bfd_link_info *, const char *,
 				       const char *, bfd_vma,
 				       bfd *, asection *, bfd_vma));
-static boolean reloc_dangerous PARAMS ((struct bfd_link_info *, const char *,
+static bfd_boolean reloc_dangerous PARAMS ((struct bfd_link_info *, const char *,
 					bfd *, asection *, bfd_vma));
-static boolean unattached_reloc PARAMS ((struct bfd_link_info *,
+static bfd_boolean unattached_reloc PARAMS ((struct bfd_link_info *,
 					 const char *, bfd *, asection *,
 					 bfd_vma));
-static boolean notice PARAMS ((struct bfd_link_info *, const char *,
+static bfd_boolean notice PARAMS ((struct bfd_link_info *, const char *,
 			       bfd *, asection *, bfd_vma));
 
 static struct bfd_link_callbacks link_callbacks = {
@@ -207,19 +207,19 @@ main (argc, argv)
 #endif
 
   /* Initialize the data about options.  */
-  trace_files = trace_file_tries = version_printed = false;
-  whole_archive = false;
-  config.build_constructors = true;
-  config.dynamic_link = false;
-  config.has_shared = false;
+  trace_files = trace_file_tries = version_printed = FALSE;
+  whole_archive = FALSE;
+  config.build_constructors = TRUE;
+  config.dynamic_link = FALSE;
+  config.has_shared = FALSE;
   config.split_by_reloc = (unsigned) -1;
   config.split_by_file = (bfd_size_type) -1;
-  command_line.force_common_definition = false;
-  command_line.inhibit_common_definition = false;
+  command_line.force_common_definition = FALSE;
+  command_line.inhibit_common_definition = FALSE;
   command_line.interpreter = NULL;
   command_line.rpath = NULL;
-  command_line.warn_mismatch = true;
-  command_line.check_section_addresses = true;
+  command_line.warn_mismatch = TRUE;
+  command_line.check_section_addresses = TRUE;
 
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
@@ -229,27 +229,27 @@ main (argc, argv)
   demangling = getenv ("COLLECT_NO_DEMANGLE") == NULL;
 
   link_info.callbacks = &link_callbacks;
-  link_info.relocateable = false;
-  link_info.emitrelocations = false;
-  link_info.shared = false;
-  link_info.symbolic = false;
-  link_info.export_dynamic = false;
-  link_info.static_link = false;
-  link_info.traditional_format = false;
-  link_info.optimize = false;
-  link_info.no_undefined = false;
-  link_info.allow_shlib_undefined = false;
-  link_info.allow_multiple_definition = false;
-  link_info.allow_undefined_version = true;
+  link_info.relocateable = FALSE;
+  link_info.emitrelocations = FALSE;
+  link_info.shared = FALSE;
+  link_info.symbolic = FALSE;
+  link_info.export_dynamic = FALSE;
+  link_info.static_link = FALSE;
+  link_info.traditional_format = FALSE;
+  link_info.optimize = FALSE;
+  link_info.no_undefined = FALSE;
+  link_info.allow_shlib_undefined = FALSE;
+  link_info.allow_multiple_definition = FALSE;
+  link_info.allow_undefined_version = TRUE;
   link_info.strip = strip_none;
   link_info.discard = discard_sec_merge;
-  link_info.keep_memory = true;
+  link_info.keep_memory = TRUE;
   link_info.input_bfds = NULL;
   link_info.create_object_symbols_section = NULL;
   link_info.gc_sym_list = NULL;
   link_info.hash = NULL;
   link_info.keep_hash = NULL;
-  link_info.notice_all = false;
+  link_info.notice_all = FALSE;
   link_info.notice_hash = NULL;
   link_info.wrap_hash = NULL;
   link_info.mpc860c0 = 0;
@@ -257,29 +257,29 @@ main (argc, argv)
      and _fini symbols.  We are compatible.  */
   link_info.init_function = "_init";
   link_info.fini_function = "_fini";
-  link_info.new_dtags = false;
-  link_info.eh_frame_hdr = false;
+  link_info.new_dtags = FALSE;
+  link_info.eh_frame_hdr = FALSE;
   link_info.flags = (bfd_vma) 0;
   link_info.flags_1 = (bfd_vma) 0;
   link_info.pei386_auto_import = -1;
-  link_info.pei386_runtime_pseudo_reloc = false;
-  link_info.combreloc = true;
+  link_info.pei386_runtime_pseudo_reloc = FALSE;
+  link_info.combreloc = TRUE;
   link_info.spare_dynamic_tags = 5;
   link_info.common_skip_ar_aymbols = bfd_link_common_skip_none;
 
   ldfile_add_arch ("");
 
-  config.make_executable = true;
-  force_make_executable = false;
-  config.magic_demand_paged = true;
-  config.text_read_only = true;
+  config.make_executable = TRUE;
+  force_make_executable = FALSE;
+  config.magic_demand_paged = TRUE;
+  config.text_read_only = TRUE;
 
   emulation = get_emulation (argc, argv);
   ldemul_choose_mode (emulation);
   default_target = ldemul_choose_target (argc, argv);
   lang_init ();
   ldemul_before_parse ();
-  lang_has_input_file = false;
+  lang_has_input_file = FALSE;
   parse_args (argc, argv);
 
   ldemul_set_symbols ();
@@ -372,7 +372,7 @@ main (argc, argv)
 
   lang_final ();
 
-  if (lang_has_input_file == false)
+  if (!lang_has_input_file)
     {
       if (version_printed)
 	xexit (0);
@@ -427,9 +427,9 @@ main (argc, argv)
      be reported in the exit status.  (What non-fatal errors, if any, do we
      want to ignore for relocateable output?)  */
 
-  if (config.make_executable == false && force_make_executable == false)
+  if (!config.make_executable && !force_make_executable)
     {
-      if (trace_files == true)
+      if (trace_files)
 	{
 	  einfo (_("%P: link errors found, deleting executable `%s'\n"),
 		 output_filename);
@@ -578,17 +578,17 @@ get_emulation (argc, argv)
 }
 
 /* If directory DIR contains an "ldscripts" subdirectory,
-   add DIR to the library search path and return true,
-   else return false.  */
+   add DIR to the library search path and return TRUE,
+   else return FALSE.  */
 
-static boolean
+static bfd_boolean
 check_for_scripts_dir (dir)
      char *dir;
 {
   size_t dirlen;
   char *buf;
   struct stat s;
-  boolean res;
+  bfd_boolean res;
 
   dirlen = strlen (dir);
   /* sizeof counts the terminating NUL.  */
@@ -598,7 +598,7 @@ check_for_scripts_dir (dir)
   res = stat (buf, &s) == 0 && S_ISDIR (s.st_mode);
   free (buf);
   if (res)
-    ldfile_add_library_path (dir, false);
+    ldfile_add_library_path (dir, FALSE);
   return res;
 }
 
@@ -672,7 +672,7 @@ add_ysym (name)
 	einfo (_("%P%F: bfd_hash_table_init failed: %E\n"));
     }
 
-  if (bfd_hash_lookup (link_info.notice_hash, name, true, true)
+  if (bfd_hash_lookup (link_info.notice_hash, name, TRUE, TRUE)
       == (struct bfd_hash_entry *) NULL)
     einfo (_("%P%F: bfd_hash_lookup failed: %E\n"));
 }
@@ -692,7 +692,7 @@ add_wrap (name)
 				   61))
 	einfo (_("%P%F: bfd_hash_table_init failed: %E\n"));
     }
-  if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL)
+  if (bfd_hash_lookup (link_info.wrap_hash, name, TRUE, TRUE) == NULL)
     einfo (_("%P%F: bfd_hash_lookup failed: %E\n"));
 }
 
@@ -750,7 +750,7 @@ add_keepsyms_file (filename)
 
 	  buf[len] = '\0';
 
-	  if (bfd_hash_lookup (link_info.keep_hash, buf, true, true)
+	  if (bfd_hash_lookup (link_info.keep_hash, buf, TRUE, TRUE)
 	      == (struct bfd_hash_entry *) NULL)
 	    einfo (_("%P%F: bfd_hash_lookup for insertion failed: %E\n"));
 	}
@@ -767,7 +767,7 @@ add_keepsyms_file (filename)
 /* This is called when BFD has decided to include an archive member in
    a link.  */
 
-static boolean
+static bfd_boolean
 add_archive_element (info, abfd, name)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      bfd *abfd;
@@ -782,9 +782,9 @@ add_archive_element (info, abfd, name)
   input->the_bfd = abfd;
   input->asymbols = NULL;
   input->next = NULL;
-  input->just_syms_flag = false;
-  input->loaded = false;
-  input->search_dirs_flag = false;
+  input->just_syms_flag = FALSE;
+  input->loaded = FALSE;
+  input->search_dirs_flag = FALSE;
 
   /* FIXME: The following fields are not set: header.next,
      header.type, closed, passive_position, symbol_count,
@@ -796,12 +796,12 @@ add_archive_element (info, abfd, name)
 
   if (config.map_file != (FILE *) NULL)
     {
-      static boolean header_printed;
+      static bfd_boolean header_printed;
       struct bfd_link_hash_entry *h;
       bfd *from;
       int len;
 
-      h = bfd_link_hash_lookup (link_info.hash, name, false, false, true);
+      h = bfd_link_hash_lookup (link_info.hash, name, FALSE, FALSE, TRUE);
 
       if (h == NULL)
 	from = NULL;
@@ -835,7 +835,7 @@ add_archive_element (info, abfd, name)
 
 	  sprintf (buf, _("Archive member included because of file (symbol)\n\n"));
 	  minfo ("%s", buf);
-	  header_printed = true;
+	  header_printed = TRUE;
 	}
 
       if (bfd_my_archive (abfd) == NULL)
@@ -874,13 +874,13 @@ add_archive_element (info, abfd, name)
   if (trace_files || trace_file_tries)
     info_msg ("%I\n", input);
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when BFD has discovered a symbol which is defined
    multiple times.  */
 
-static boolean
+static bfd_boolean
 multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *name;
@@ -902,7 +902,7 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
       || (nsec->output_section != NULL
 	  && ! bfd_is_abs_section (nsec)
 	  && bfd_is_abs_section (nsec->output_section)))
-    return true;
+    return TRUE;
 
   einfo (_("%X%C: multiple definition of `%T'\n"),
 	 nbfd, nsec, nval, name);
@@ -915,7 +915,7 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
       command_line.relax = 0;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when there is a definition of a common symbol, or
@@ -923,7 +923,7 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
    or when two common symbols are found.  We only do something if
    -warn-common was used.  */
 
-static boolean
+static bfd_boolean
 multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *name;
@@ -935,7 +935,7 @@ multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize)
      bfd_vma nsize;
 {
   if (! config.warn_common)
-    return true;
+    return TRUE;
 
   if (ntype == bfd_link_hash_defined
       || ntype == bfd_link_hash_defweak
@@ -982,14 +982,14 @@ multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize)
 	}
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when BFD has discovered a set element.  H is the
    entry in the linker hash table for the set.  SECTION and VALUE
    represent a value which should be added to the set.  */
 
-static boolean
+static bfd_boolean
 add_to_set (info, h, reloc, abfd, section, value)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      struct bfd_link_hash_entry *h;
@@ -1003,7 +1003,7 @@ add_to_set (info, h, reloc, abfd, section, value)
 	   h->root.string);
 
   if (! config.build_constructors)
-    return true;
+    return TRUE;
 
   ldctor_add_set_entry (h, reloc, (const char *) NULL, section, value);
 
@@ -1016,7 +1016,7 @@ add_to_set (info, h, reloc, abfd, section, value)
 	 ourselves.  */
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when BFD has discovered a constructor.  This is only
@@ -1024,10 +1024,10 @@ add_to_set (info, h, reloc, abfd, section, value)
    constructors in some more clever fashion.  This is similar to
    adding an element to a set, but less general.  */
 
-static boolean
+static bfd_boolean
 constructor_callback (info, constructor, name, abfd, section, value)
      struct bfd_link_info *info;
-     boolean constructor;
+     bfd_boolean constructor;
      const char *name;
      bfd *abfd;
      asection *section;
@@ -1041,7 +1041,7 @@ constructor_callback (info, constructor, name, abfd, section, value)
     einfo (_("%P: warning: global constructor %s used\n"), name);
 
   if (! config.build_constructors)
-    return true;
+    return TRUE;
 
   /* Ensure that BFD_RELOC_CTOR exists now, so that we can give a
      useful error message.  */
@@ -1058,7 +1058,7 @@ constructor_callback (info, constructor, name, abfd, section, value)
   else
     strcpy (s, "__DTOR_LIST__");
 
-  h = bfd_link_hash_lookup (info->hash, set_name, true, true, true);
+  h = bfd_link_hash_lookup (info->hash, set_name, TRUE, TRUE, TRUE);
   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
   if (h->type == bfd_link_hash_new)
@@ -1071,14 +1071,14 @@ constructor_callback (info, constructor, name, abfd, section, value)
     }
 
   ldctor_add_set_entry (h, BFD_RELOC_CTOR, name, section, value);
-  return true;
+  return TRUE;
 }
 
 /* A structure used by warning_callback to pass information through
    bfd_map_over_sections.  */
 
 struct warning_callback_info {
-  boolean found;
+  bfd_boolean found;
   const char *warning;
   const char *symbol;
   asymbol **asymbols;
@@ -1086,7 +1086,7 @@ struct warning_callback_info {
 
 /* This is called when there is a reference to a warning symbol.  */
 
-static boolean
+static bfd_boolean
 warning_callback (info, warning, symbol, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *warning;
@@ -1099,7 +1099,7 @@ warning_callback (info, warning, symbol, abfd, section, address)
      have a cleaner interface, but what?  */
   if (! config.warn_multiple_gp
       && strcmp (warning, "using multiple gp values") == 0)
-    return true;
+    return TRUE;
 
   if (section != NULL)
     einfo ("%C: %s\n", abfd, section, address, warning);
@@ -1138,7 +1138,7 @@ warning_callback (info, warning, symbol, abfd, section, address)
 	    }
 	}
 
-      info.found = false;
+      info.found = FALSE;
       info.warning = warning;
       info.symbol = symbol;
       info.asymbols = asymbols;
@@ -1151,7 +1151,7 @@ warning_callback (info, warning, symbol, abfd, section, address)
 	free (asymbols);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called by warning_callback for each section.  It checks the
@@ -1197,7 +1197,7 @@ warning_find_reloc (abfd, sec, iarg)
 	{
 	  /* We found a reloc for the symbol we are looking for.  */
 	  einfo ("%C: %s\n", abfd, sec, q->address, info->warning);
-	  info->found = true;
+	  info->found = TRUE;
 	  break;
 	}
     }
@@ -1207,14 +1207,14 @@ warning_find_reloc (abfd, sec, iarg)
 
 /* This is called when an undefined symbol is found.  */
 
-static boolean
+static bfd_boolean
 undefined_symbol (info, name, abfd, section, address, fatal)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *name;
      bfd *abfd;
      asection *section;
      bfd_vma address;
-     boolean fatal ATTRIBUTE_UNUSED;
+     bfd_boolean fatal ATTRIBUTE_UNUSED;
 {
   static char *error_name;
   static unsigned int error_count;
@@ -1235,10 +1235,10 @@ undefined_symbol (info, name, abfd, section, address, fatal)
 	    einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
 	}
 
-      if (bfd_hash_lookup (hash, name, false, false) != NULL)
-	return true;
+      if (bfd_hash_lookup (hash, name, FALSE, FALSE) != NULL)
+	return TRUE;
 
-      if (bfd_hash_lookup (hash, name, true, true) == NULL)
+      if (bfd_hash_lookup (hash, name, TRUE, TRUE) == NULL)
 	einfo (_("%F%P: bfd_hash_lookup failed: %E\n"));
     }
 
@@ -1282,12 +1282,12 @@ undefined_symbol (info, name, abfd, section, address, fatal)
 	       abfd, name);
     }
 
-  return true;
+  return TRUE;
 }
 
 /* This is called when a reloc overflows.  */
 
-static boolean
+static bfd_boolean
 reloc_overflow (info, name, reloc_name, addend, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *name;
@@ -1305,12 +1305,12 @@ reloc_overflow (info, name, reloc_name, addend, abfd, section, address)
   if (addend != 0)
     einfo ("+%v", addend);
   einfo ("\n");
-  return true;
+  return TRUE;
 }
 
 /* This is called when a dangerous relocation is made.  */
 
-static boolean
+static bfd_boolean
 reloc_dangerous (info, message, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *message;
@@ -1323,13 +1323,13 @@ reloc_dangerous (info, message, abfd, section, address)
   else
     einfo ("%X%C:", abfd, section, address);
   einfo (_("dangerous relocation: %s\n"), message);
-  return true;
+  return TRUE;
 }
 
 /* This is called when a reloc is being generated attached to a symbol
    that is not being output.  */
 
-static boolean
+static bfd_boolean
 unattached_reloc (info, name, abfd, section, address)
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      const char *name;
@@ -1342,14 +1342,14 @@ unattached_reloc (info, name, abfd, section, address)
   else
     einfo ("%X%C:", abfd, section, address);
   einfo (_(" reloc refers to symbol `%T' which is not being output\n"), name);
-  return true;
+  return TRUE;
 }
 
 /* This is called if link_info.notice_all is set, or when a symbol in
    link_info.notice_hash is found.  Symbols are put in notice_hash
    using the -y option.  */
 
-static boolean
+static bfd_boolean
 notice (info, name, abfd, section, value)
      struct bfd_link_info *info;
      const char *name;
@@ -1359,7 +1359,7 @@ notice (info, name, abfd, section, value)
 {
   if (! info->notice_all
       || (info->notice_hash != NULL
-	  && bfd_hash_lookup (info->notice_hash, name, false, false) != NULL))
+	  && bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) != NULL))
     {
       if (bfd_is_und_section (section))
 	einfo ("%B: reference to %s\n", abfd, name);
@@ -1370,5 +1370,5 @@ notice (info, name, abfd, section, value)
   if (command_line.cref || nocrossref_list != NULL)
     add_cref (name, abfd, section, value);
 
-  return true;
+  return TRUE;
 }