9030 sgs: duplicate 'const' declaration specifier

Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>

5 files changed, 25 insertions, 25 deletions

diff --git a/usr/src/cmd/sgs/libconv/common/elf.c b/usr/src/cmd/sgs/libconv/common/elf.c
index 0bb40f9f7e..73469c3506 100644
--- a/usr/src/cmd/sgs/libconv/common/elf.c
+++ b/usr/src/cmd/sgs/libconv/common/elf.c
@@ -328,17 +328,17 @@ ehdr_mach_strings(Conv_fmt_flags_t fmt_flags)
 
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_mach_0_11_cf), CONV_DS_ADDR(ds_mach_15_22_cf),
 		CONV_DS_ADDR(ds_mach_36_63_cf), CONV_DS_ADDR(ds_mach_66_94_cf),
 		NULL
 	};
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_mach_0_11_nf), CONV_DS_ADDR(ds_mach_15_22_nf),
 		CONV_DS_ADDR(ds_mach_36_63_nf), CONV_DS_ADDR(ds_mach_66_94_nf),
 		NULL
 	};
-	static const const conv_ds_t	*ds_dmp[] = {
+	static const conv_ds_t	*ds_dmp[] = {
 		CONV_DS_ADDR(ds_mach_0_11_dmp), CONV_DS_ADDR(ds_mach_15_22_dmp),
 		CONV_DS_ADDR(ds_mach_36_63_dmp),
 		CONV_DS_ADDR(ds_mach_66_94_dmp), NULL
@@ -426,7 +426,7 @@ error "EI_PAD has grown. Update etypes[]"
 		CONV_DS_MSG_INIT(EI_MAG0, eident_nf) };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_eident_cf), NULL };
 	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_eident_nf), NULL };
@@ -495,7 +495,7 @@ error "ET_LOSUNW has grown. Update type_osabi[]"
 
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_type_cf), CONV_DS_ADDR(ds_type_osabi_cf),
 		NULL };
 	static const conv_ds_t	*ds_nf[] = {
@@ -557,7 +557,7 @@ error "EV_NUM has grown. Update versions[]"
 		CONV_DS_MSG_INIT(EV_NONE, versions_dmp) };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_versions_cf), NULL };
 	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_versions_nf), NULL };
@@ -805,13 +805,13 @@ ehdr_osabi_strings(Conv_fmt_flags_t fmt_flags)
 	    CONV_DS_VD, ELFOSABI_ARM, ELFOSABI_STANDALONE, osabi_misc_dmp };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_osabi_0_3_cf), CONV_DS_ADDR(ds_osabi_6_15_cf),
 		CONV_DS_ADDR(ds_osabi_misc_cf), NULL };
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_osabi_0_3_nf), CONV_DS_ADDR(ds_osabi_6_15_nf),
 		CONV_DS_ADDR(ds_osabi_misc_nf), NULL };
-	static const const conv_ds_t	*ds_dmp[] = {
+	static const conv_ds_t	*ds_dmp[] = {
 		CONV_DS_ADDR(ds_osabi_0_3_dmp), CONV_DS_ADDR(ds_osabi_6_15_dmp),
 		CONV_DS_ADDR(ds_osabi_misc_dmp), NULL };
 
@@ -879,7 +879,7 @@ error "EAV_SUNW_NUM has grown. Update abiversions[]"
 		CONV_DS_MSG_INIT(EV_NONE, abiversions_nf) };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_abiversions_cf), NULL };
 	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_abiversions_nf), NULL };
diff --git a/usr/src/cmd/sgs/libconv/common/phdr.c b/usr/src/cmd/sgs/libconv/common/phdr.c
index 05aeb0a89b..d2b29a201f 100644
--- a/usr/src/cmd/sgs/libconv/common/phdr.c
+++ b/usr/src/cmd/sgs/libconv/common/phdr.c
@@ -154,7 +154,7 @@ error "PT_NUM has grown. Update phdrs[]"
 
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_def[] = {
+	static const conv_ds_t	*ds_def[] = {
 		CONV_DS_ADDR(ds_phdrs_def), CONV_DS_ADDR(ds_phdrs_osabi_def),
 		NULL };
 	static const conv_ds_t	*ds_dmp[] = {
diff --git a/usr/src/cmd/sgs/libconv/common/symbols.c b/usr/src/cmd/sgs/libconv/common/symbols.c
index 5da02cb407..fd81544c59 100644
--- a/usr/src/cmd/sgs/libconv/common/symbols.c
+++ b/usr/src/cmd/sgs/libconv/common/symbols.c
@@ -89,11 +89,11 @@ conv_sym_other_vis_strings(Conv_fmt_flags_t fmt_flags)
 	    CONV_DS_MSG_INIT(STV_DEFAULT, vis_nf) };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_def[] = {
+	static const conv_ds_t	*ds_def[] = {
 		CONV_DS_ADDR(ds_vis_def), NULL };
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_vis_cf), NULL };
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_vis_nf), NULL };
 
 	/* Select the strings to use */
@@ -240,11 +240,11 @@ conv_sym_info_bind_strings(Conv_fmt_flags_t fmt_flags)
 
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_def[] = {
+	static const conv_ds_t	*ds_def[] = {
 		CONV_DS_ADDR(ds_binds_def), NULL };
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_binds_cf), NULL };
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_binds_nf), NULL };
 
 
@@ -341,13 +341,13 @@ conv_sym_shndx_strings(Conv_fmt_flags_t fmt_flags)
 	    CONV_DS_VD2, SHN_UNDEF, SHN_XINDEX, shn_nf };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_def[] = {
+	static const conv_ds_t	*ds_def[] = {
 		CONV_DS_ADDR(ds_shn_def), NULL };
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_shn_cf), NULL };
-	static const const conv_ds_t	*ds_cfnp[] = {
+	static const conv_ds_t	*ds_cfnp[] = {
 		CONV_DS_ADDR(ds_shn_cfnp), NULL };
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_shn_nf), NULL };
 
 	/* Select the strings to use */
diff --git a/usr/src/cmd/sgs/libconv/common/syminfo.c b/usr/src/cmd/sgs/libconv/common/syminfo.c
index 70c05cb862..3487ffd21c 100644
--- a/usr/src/cmd/sgs/libconv/common/syminfo.c
+++ b/usr/src/cmd/sgs/libconv/common/syminfo.c
@@ -167,11 +167,11 @@ conv_syminfo_boundto_strings(Conv_fmt_flags_t fmt_flags)
 	    CONV_DS_MSG_INIT(SYMINFO_BT_EXTERN, boundto_nf) };
 
 	/* Build NULL terminated return arrays for each string style */
-	static const const conv_ds_t	*ds_cf[] = {
+	static const conv_ds_t	*ds_cf[] = {
 		CONV_DS_ADDR(ds_boundto_cf), NULL };
-	static const const conv_ds_t	*ds_cfnp[] = {
+	static const conv_ds_t	*ds_cfnp[] = {
 		CONV_DS_ADDR(ds_boundto_cfnp), NULL };
-	static const const conv_ds_t	*ds_nf[] = {
+	static const conv_ds_t	*ds_nf[] = {
 		CONV_DS_ADDR(ds_boundto_nf), NULL };
 
 	/* Select the strings to use */
diff --git a/usr/src/cmd/sgs/libld/common/syms.c b/usr/src/cmd/sgs/libld/common/syms.c
index 14455dfc42..3d2e361037 100644
--- a/usr/src/cmd/sgs/libld/common/syms.c
+++ b/usr/src/cmd/sgs/libld/common/syms.c
@@ -3109,7 +3109,7 @@ ld_sym_add_u(const char *name, Ofl_desc *ofl, Msg mid)
  *	Sets isp->is_sym_name to the allocated string. Returns the
  *	string pointer, or NULL on allocation failure.
  */
-const const char *
+const char *
 ld_stt_section_sym_name(Is_desc *isp)
 {
 	const char	*fmt;