This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
replace CONST with const
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Date: Sat, 8 Jun 2002 16:59:04 +0930
- Subject: replace CONST with const
CONST is deprecated.
bfd/ChangeLog
* armnetbsd.c: Replace CONST with const.
* corefile.c: Likewise.
* elf32-dlx.c: Likewise.
* elf64-mips.c: Likewise.
* mmo.c: Likewise.
* ns32knetbsd.c: Likewise.
Index: bfd/armnetbsd.c
===================================================================
RCS file: /cvs/src/src/bfd/armnetbsd.c,v
retrieving revision 1.4
diff -u -p -r1.4 armnetbsd.c
--- bfd/armnetbsd.c 2 Oct 2001 05:58:41 -0000 1.4
+++ bfd/armnetbsd.c 8 Jun 2002 04:22:08 -0000
@@ -1,5 +1,5 @@
/* BFD back-end for NetBSD/ARM a.out-ish binaries.
- Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suit
#include "bfd.h" /* To ensure following declaration is OK */
-CONST struct reloc_howto_struct *
+const struct reloc_howto_struct *
MY_bfd_reloc_type_lookup
PARAMS ((bfd * abfd AND
bfd_reloc_code_real_type code));
Index: bfd/corefile.c
===================================================================
RCS file: /cvs/src/src/bfd/corefile.c,v
retrieving revision 1.4
diff -u -p -r1.4 corefile.c
--- bfd/corefile.c 18 Sep 2001 09:57:22 -0000 1.4
+++ bfd/corefile.c 8 Jun 2002 04:22:13 -0000
@@ -1,5 +1,5 @@
/* Core file generic interface routines for BFD.
- Copyright 1990, 1991, 1992, 1993, 1994, 2000, 2001
+ Copyright 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2002
Free Software Foundation, Inc.
Written by Cygnus Support.
@@ -44,7 +44,7 @@ DESCRIPTION
*/
-CONST char *
+const char *
bfd_core_file_failing_command (abfd)
bfd *abfd;
{
Index: bfd/elf32-dlx.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-dlx.c,v
retrieving revision 1.2
diff -u -p -r1.2 elf32-dlx.c
--- bfd/elf32-dlx.c 3 Jun 2002 01:57:09 -0000 1.2
+++ bfd/elf32-dlx.c 8 Jun 2002 04:22:13 -0000
@@ -500,7 +500,7 @@ struct elf_reloc_map
enum elf_dlx_reloc_type elf_reloc_val;
};
-static CONST struct elf_reloc_map dlx_reloc_map[] =
+static const struct elf_reloc_map dlx_reloc_map[] =
{
{ BFD_RELOC_NONE, R_DLX_NONE },
{ BFD_RELOC_16, R_DLX_RELOC_16 },
Index: bfd/elf64-mips.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-mips.c,v
retrieving revision 1.32
diff -u -p -r1.32 elf64-mips.c
--- bfd/elf64-mips.c 5 Jun 2002 13:32:01 -0000 1.32
+++ bfd/elf64-mips.c 8 Jun 2002 04:22:14 -0000
@@ -1548,7 +1548,7 @@ mips_elf64_assign_gp (output_bfd, pgp)
{
for (i = 0; i < count; i++, sym++)
{
- register CONST char *name;
+ register const char *name;
name = bfd_asymbol_name (*sym);
if (*name == '_' && strcmp (name, "_gp") == 0)
Index: bfd/mmo.c
===================================================================
RCS file: /cvs/src/src/bfd/mmo.c,v
retrieving revision 1.9
diff -u -p -r1.9 mmo.c
--- bfd/mmo.c 5 Jun 2002 03:43:11 -0000 1.9
+++ bfd/mmo.c 8 Jun 2002 04:22:18 -0000
@@ -260,7 +260,7 @@ enum mmo_sym_type { mmo_reg_sym, mmo_und
struct mmo_symbol
{
struct mmo_symbol *next;
- CONST char *name;
+ const char *name;
bfd_vma value;
enum mmo_sym_type sym_type;
unsigned int serno;
@@ -357,7 +357,7 @@ static void mmo_write_section_unless_reg
PARAMS ((bfd *, asection *, PTR));
static void mmo_find_sec_w_addr PARAMS ((bfd *, asection *, PTR));
static void mmo_find_sec_w_addr_grow PARAMS ((bfd *, asection *, PTR));
-static asection *mmo_make_section PARAMS ((bfd *, CONST char *));
+static asection *mmo_make_section PARAMS ((bfd *, const char *));
static void mmo_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
static void mmo_print_symbol
PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
@@ -371,10 +371,10 @@ static INLINE bfd_byte *mmo_get_loc PARA
static void mmo_xore_64 PARAMS ((asection *, bfd_vma vma, bfd_vma value));
static void mmo_xore_32 PARAMS ((asection *, bfd_vma vma, unsigned int));
static void mmo_xore_16 PARAMS ((asection *, bfd_vma vma, unsigned int));
-static CONST bfd_target *mmo_object_p PARAMS ((bfd *));
+static const bfd_target *mmo_object_p PARAMS ((bfd *));
static void mmo_map_set_sizes PARAMS ((bfd *, asection *, PTR));
static boolean mmo_get_symbols PARAMS ((bfd *));
-static boolean mmo_create_symbol PARAMS ((bfd *, CONST char *, bfd_vma,
+static boolean mmo_create_symbol PARAMS ((bfd *, const char *, bfd_vma,
enum mmo_sym_type, unsigned int));
static boolean mmo_get_section_contents
PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
@@ -391,7 +391,7 @@ static long mmo_get_reloc_upper_bound PA
static boolean mmo_internal_write_header PARAMS ((bfd *));
static boolean mmo_internal_write_post PARAMS ((bfd *, int, asection *));
static boolean mmo_internal_add_3_sym
- PARAMS ((bfd *, struct mmo_symbol_trie *, CONST struct mmo_symbol *));
+ PARAMS ((bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *));
static unsigned int mmo_internal_3_length
PARAMS ((bfd *, struct mmo_symbol_trie *));
static void mmo_internal_3_dump
@@ -404,10 +404,10 @@ static void mmo_write_tetra_raw PARAMS (
static void mmo_write_octa PARAMS ((bfd *, bfd_vma));
static void mmo_write_octa_raw PARAMS ((bfd *, bfd_vma));
static boolean mmo_write_chunk
- PARAMS ((bfd *, CONST bfd_byte *, unsigned int));
+ PARAMS ((bfd *, const bfd_byte *, unsigned int));
static boolean mmo_flush_chunk PARAMS ((bfd *));
static boolean mmo_write_loc_chunk
- PARAMS ((bfd *, bfd_vma, CONST bfd_byte *, unsigned int, bfd_vma *));
+ PARAMS ((bfd *, bfd_vma, const bfd_byte *, unsigned int, bfd_vma *));
static boolean mmo_write_chunk_list PARAMS ((bfd *, mmo_data_list_type *));
static boolean mmo_write_loc_chunk_list
PARAMS ((bfd *, mmo_data_list_type *));
@@ -417,7 +417,7 @@ static flagword bfd_sec_flags_from_mmo_f
static bfd_byte mmo_get_byte PARAMS ((bfd *));
static void mmo_write_byte PARAMS ((bfd *, bfd_byte));
static boolean mmo_new_section_hook PARAMS ((bfd *, asection *));
-static int mmo_sort_mmo_symbols PARAMS ((CONST PTR, CONST PTR));
+static int mmo_sort_mmo_symbols PARAMS ((const PTR, const PTR));
static boolean mmo_write_object_contents PARAMS ((bfd *));
static long mmo_canonicalize_reloc
PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
@@ -446,7 +446,7 @@ char valid_mmo_symbol_character_set[/* A
static asection *
mmo_make_section (abfd, secname)
bfd *abfd;
- CONST char *secname;
+ const char *secname;
{
asection *sec = bfd_get_section_by_name (abfd, secname);
@@ -495,7 +495,7 @@ mmo_init ()
/* Check whether an existing file is an mmo file. */
-static CONST bfd_target *
+static const bfd_target *
mmo_object_p (abfd)
bfd *abfd;
{
@@ -819,7 +819,7 @@ mmo_write_octa_raw (abfd, value)
static INLINE boolean
mmo_write_chunk (abfd, loc, len)
bfd *abfd;
- CONST bfd_byte *loc;
+ const bfd_byte *loc;
unsigned int len;
{
boolean retval = true;
@@ -907,7 +907,7 @@ static boolean
mmo_write_loc_chunk (abfd, vma, loc, len, last_vmap)
bfd *abfd;
bfd_vma vma;
- CONST bfd_byte *loc;
+ const bfd_byte *loc;
unsigned int len;
bfd_vma *last_vmap;
{
@@ -1199,7 +1199,7 @@ mmo_write_byte (abfd, value)
static boolean
mmo_create_symbol (abfd, symname, addr, sym_type, serno)
bfd *abfd;
- CONST char *symname;
+ const char *symname;
bfd_vma addr;
enum mmo_sym_type sym_type;
unsigned int serno;
@@ -2135,11 +2135,11 @@ mmo_get_symtab_upper_bound (abfd)
static int
mmo_sort_mmo_symbols (arg1, arg2)
- CONST PTR arg1;
- CONST PTR arg2;
+ const PTR arg1;
+ const PTR arg2;
{
- CONST struct mmo_symbol *sym1 = *(CONST struct mmo_symbol **) arg1;
- CONST struct mmo_symbol *sym2 = *(CONST struct mmo_symbol **) arg2;
+ const struct mmo_symbol *sym1 = *(const struct mmo_symbol **) arg1;
+ const struct mmo_symbol *sym2 = *(const struct mmo_symbol **) arg2;
/* Sort by serial number first. */
if (sym1->serno < sym2->serno)
@@ -2148,7 +2148,7 @@ mmo_sort_mmo_symbols (arg1, arg2)
return 1;
/* Then sort by address of the table entries. */
- return ((CONST char *) arg1 - (CONST char *) arg2);
+ return ((const char *) arg1 - (const char *) arg2);
}
/* Translate the symbol table. */
@@ -2295,7 +2295,7 @@ static boolean
mmo_internal_write_header (abfd)
bfd *abfd;
{
- CONST char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};
+ const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};
if (bfd_bwrite (lop_pre_bfd, 4, abfd) != 4)
return false;
@@ -2619,9 +2619,9 @@ static boolean
mmo_internal_add_3_sym (abfd, rootp, symp)
bfd *abfd;
struct mmo_symbol_trie *rootp;
- CONST struct mmo_symbol *symp;
+ const struct mmo_symbol *symp;
{
- CONST char *name = symp->name;
+ const char *name = symp->name;
struct mmo_symbol_trie *trie = rootp;
struct mmo_symbol_trie **triep = NULL;
@@ -3278,7 +3278,7 @@ mmo_canonicalize_reloc (abfd, section, r
#define mmo_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
#define mmo_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
-CONST bfd_target bfd_mmo_vec =
+const bfd_target bfd_mmo_vec =
{
"mmo", /* name */
bfd_target_mmo_flavour,
Index: bfd/ns32knetbsd.c
===================================================================
RCS file: /cvs/src/src/bfd/ns32knetbsd.c,v
retrieving revision 1.4
diff -u -p -r1.4 ns32knetbsd.c
--- bfd/ns32knetbsd.c 2 Oct 2001 05:58:41 -0000 1.4
+++ bfd/ns32knetbsd.c 8 Jun 2002 04:22:18 -0000
@@ -1,5 +1,5 @@
/* BFD back-end for NetBSD/ns32k a.out-ish binaries.
- Copyright 1990, 1991, 1992, 1994, 1995, 1998, 2000, 2001
+ Copyright 1990, 1991, 1992, 1994, 1995, 1998, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suit
#include "bfd.h" /* To ensure following declaration is OK */
-CONST struct reloc_howto_struct *
+const struct reloc_howto_struct *
MY_bfd_reloc_type_lookup
PARAMS((bfd *abfd AND
bfd_reloc_code_real_type code));
--
Alan Modra
IBM OzLabs - Linux Technology Centre