* locale/programs/localedef.c (add_to_readlist): Rename local

	variables to avoid confusion.

	* locale/programs/charmap.c (charmap_read): Emit error message if
	charmap couldn't be found or read.

1 files changed, 12 insertions, 12 deletions

diff --git a/localedata/locales/zh_SG b/localedata/locales/zh_SG
index 60c985c072..7be5b647a6 100644
--- a/localedata/locales/zh_SG
+++ b/localedata/locales/zh_SG
@@ -32,7 +32,7 @@ category  "zh_SG:2000";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
-copy "i18n"
+copy "zh_CN"
 END LC_CTYPE
 
 LC_COLLATE
@@ -46,7 +46,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0053><U0047><U0044><U0020>"
@@ -81,7 +81,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -112,22 +112,22 @@ mon         "<U4E00><U6708>";"<U4E8C><U6708>";/
             "<U4E5D><U6708>";"<U5341><U6708>";/
             "<U5341><U4E00><U6708>";"<U5341><U4E8C><U6708>"
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U4E0A><U5348>";"<U4E0B><U5348>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %Y\u5e74%m\u6708%d\u65e5 %H\u65f6%M\u5206%S\u79d2 %Z
 d_t_fmt     "<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064><U65E5><U0020><U0025><U0048><U65F6><U0025><U004D><U5206><U0025><U0053><U79D2><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %Y\u5e74%m\u6708%d\u65e5
 d_fmt       "<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064><U65E5>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %H\u65f6%M\u5206%S\u79d2 %Z
 t_fmt       "<U0025><U0048><U65F6><U0025><U004D><U5206><U0025><U0053><U79D2><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  ""
 %
 END LC_TIME
@@ -142,14 +142,14 @@ LC_MESSAGES
 % ^[yY]
 yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
 %
 % ^[nN]
 noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 %
 
@@ -174,8 +174,8 @@ END LC_PAPER
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"