]> git.ipfire.org Git - thirdparty/glibc.git/commit
Unconditionally call __gconv_get_path when reading iconv configuration
authorArjun Shankar <arjun@redhat.com>
Mon, 5 Nov 2018 14:45:07 +0000 (15:45 +0100)
committerArjun Shankar <arjun@redhat.com>
Mon, 5 Nov 2018 14:45:07 +0000 (15:45 +0100)
commit6d6ee04622fd77908936250b1f632c2b4388ee78
treeffcfa28ea203337d30aac76cfd03d37e912c5178
parentbd3b0fbae33a9a4cc5e2daf049443d5cf03d4251
Unconditionally call __gconv_get_path when reading iconv configuration

__gconv_read_conf is only ever called once during the program's lifetime.
This means that __gconv_path_elem is always uninitialized when the function
begins executing.  __gconv_get_path has an assert to ensure that this
expected runtime behaviour is always exhibited.  Given this, checking for a
NULL value before calling __gconv_get_path is unnecessary.  This commit
drops the condition and calls __gconv_get_path unconditionally.
ChangeLog
iconv/gconv_conf.c