From 2c33d31fa81d97addab774a2b460a3779990c132 Mon Sep 17 00:00:00 2001 From: Keith Packard via Newlib Date: Thu, 9 Jul 2020 16:58:46 -0700 Subject: [PATCH] libc/iconv: Remove unneeded pointer var for _iconv_aliases The pointer value for the iconv alias data never changes, so get rid of the pointer and make it an array instead. Signed-off-by: Keith Packard --- newlib/libc/iconv/lib/aliasesbi.c | 5 ++--- newlib/libc/iconv/lib/local.h | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/newlib/libc/iconv/lib/aliasesbi.c b/newlib/libc/iconv/lib/aliasesbi.c index dfd7090d0..83b6fd003 100644 --- a/newlib/libc/iconv/lib/aliasesbi.c +++ b/newlib/libc/iconv/lib/aliasesbi.c @@ -5,8 +5,8 @@ #include <_ansi.h> #include "encnames.h" -const char * -_iconv_aliases = +const char +_iconv_aliases[] = { #if defined (_ICONV_FROM_ENCODING_BIG5) \ || defined (_ICONV_TO_ENCODING_BIG5) @@ -210,4 +210,3 @@ _iconv_aliases = #endif "" }; - diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h index bd9dcddca..2d3a16969 100644 --- a/newlib/libc/iconv/lib/local.h +++ b/newlib/libc/iconv/lib/local.h @@ -57,10 +57,8 @@ typedef __uint16_t ucs2_t; /* 32-bit UCS-4 type */ typedef __uint32_t ucs4_t; - /* The list of built-in encoding names and aliases */ -extern const char * -_iconv_aliases; +extern const char _iconv_aliases[]; #endif /* !__ICONV_LIB_LOCAL_H__ */