Commit 0ac2c299 authored by Paul Eggert's avatar Paul Eggert
Browse files

* charset.c (load_charset): Abort instead of using uninitialized var.

parent 89ef49df
......@@ -36,6 +36,7 @@
and to avoid gcc -Wuninitialized warning.
(load_charset_map): Mark variables that gcc -Wuninitialized
does not deduce are never used uninitialized.
(load_charset): Abort instead of using uninitialized var.
 
2011-03-06 Chong Yidong <cyd@stupidchicken.com>
 
......@@ -630,8 +630,12 @@ load_charset (struct charset *charset, int control_flag)
if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP)
map = CHARSET_MAP (charset);
else if (CHARSET_UNIFIED_P (charset))
map = CHARSET_UNIFY_MAP (charset);
else
{
if (! CHARSET_UNIFIED_P (charset))
abort ();
map = CHARSET_UNIFY_MAP (charset);
}
if (STRINGP (map))
load_charset_map_from_file (charset, map, control_flag);
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment