From owner-svn-src-all@freebsd.org Thu Jun 2 17:28:40 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E960CB65D59; Thu, 2 Jun 2016 17:28:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6A431A05; Thu, 2 Jun 2016 17:28:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u52HSdfL082554; Thu, 2 Jun 2016 17:28:39 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u52HSdox082553; Thu, 2 Jun 2016 17:28:39 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201606021728.u52HSdox082553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 2 Jun 2016 17:28:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301215 - head/lib/libc/iconv X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2016 17:28:41 -0000 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) {