summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2016-06-02 17:28:39 +0000
committerpfg <pfg@FreeBSD.org>2016-06-02 17:28:39 +0000
commit68a5cf5d8697ad3def03f782aeb01dc4d1015b47 (patch)
treebd7885dab6350cd271ecafcb631ec6426bf9f36d
parent8b17712ca6775ff655e45467ef0d9cf3e5f2fd6c (diff)
downloadFreeBSD-src-68a5cf5d8697ad3def03f782aeb01dc4d1015b47.zip
FreeBSD-src-68a5cf5d8697ad3def03f782aeb01dc4d1015b47.tar.gz
citrus: Remove redundant code in _citrus_esdb_get_list().
It appears "sorted" may have not been implemented. Sorted or not, we always follow the same action so simplify the code. Leave a note for future generations. CID: 1347084
-rw-r--r--lib/libc/iconv/citrus_esdb.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/libc/iconv/citrus_esdb.c b/lib/libc/iconv/citrus_esdb.c
index ed404a6..299dd5f 100644
--- a/lib/libc/iconv/citrus_esdb.c
+++ b/lib/libc/iconv/citrus_esdb.c
@@ -291,18 +291,12 @@ _citrus_esdb_get_list(char ***rlist, size_t *rnum, bool sorted)
/* get alias entries */
while ((ret = _lookup_seq_next(cla, &key, &data)) == 0) {
- if (sorted)
- snprintf(buf, sizeof(buf), "%.*s/%.*s",
- (int)_region_size(&data),
- (const char *)_region_head(&data),
- (int)_region_size(&key),
- (const char *)_region_head(&key));
- else
- snprintf(buf, sizeof(buf), "%.*s/%.*s",
- (int)_region_size(&data),
- (const char *)_region_head(&data),
- (int)_region_size(&key),
- (const char *)_region_head(&key));
+ /* XXX: sorted? */
+ snprintf(buf, sizeof(buf), "%.*s/%.*s",
+ (int)_region_size(&data),
+ (const char *)_region_head(&data),
+ (int)_region_size(&key),
+ (const char *)_region_head(&key));
_bcs_convert_to_upper(buf);
list[num] = strdup(buf);
if (list[num] == NULL) {
OpenPOWER on IntegriCloud