svn commit: r301215 - head/lib/libc/iconv

[Pedro F. Giffuni]

Author: pfg
Date: Thu Jun  2 17:28:39 2016
New Revision: 301215
URL: https://svnweb.freebsd.org/changeset/base/301215

Log:
  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

Modified:
  head/lib/libc/iconv/citrus_esdb.c

Modified: head/lib/libc/iconv/citrus_esdb.c
==============================================================================
--- head/lib/libc/iconv/citrus_esdb.c	Thu Jun  2 17:21:57 2016	(r301214)
+++ head/lib/libc/iconv/citrus_esdb.c	Thu Jun  2 17:28:39 2016	(r301215)
@@ -291,18 +291,12 @@ _citrus_esdb_get_list(char ***rlist, siz
 
 	/* 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) {