From owner-svn-src-head@freebsd.org  Mon Nov  9 22:29:49 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 0CED1A2A766;
 Mon,  9 Nov 2015 22:29:49 +0000 (UTC)
 (envelope-from bapt@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 C9ADF1B3A;
 Mon,  9 Nov 2015 22:29:48 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA9MTlQB066123;
 Mon, 9 Nov 2015 22:29:47 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA9MTltq066122;
 Mon, 9 Nov 2015 22:29:47 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201511092229.tA9MTltq066122@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Nov 2015 22:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290622 - head/lib/libc/locale
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2015 22:29:49 -0000

Author: bapt
Date: Mon Nov  9 22:29:47 2015
New Revision: 290622
URL: https://svnweb.freebsd.org/changeset/base/290622

Log:
  nl_langinfo: Simplify case ladder
  
  The NONE:US-ASCII case isn't necessary.  The "NONE:" case will handle
  US-ASCII, so let's remove the redundant handling.
  
  Submitted by:	marino
  Obtained from:	DragonflyBSD

Modified:
  head/lib/libc/locale/nl_langinfo.c

Modified: head/lib/libc/locale/nl_langinfo.c
==============================================================================
--- head/lib/libc/locale/nl_langinfo.c	Mon Nov  9 22:12:29 2015	(r290621)
+++ head/lib/libc/locale/nl_langinfo.c	Mon Nov  9 22:29:47 2015	(r290622)
@@ -72,8 +72,6 @@ nl_langinfo_l(nl_item item, locale_t loc
 			ret = "SJIS";
 		else if (strcmp(s, "NONE") == 0)
 			ret = "POSIX";
-		else if (strcmp(s, "NONE:US-ASCII") == 0)
-			ret = "US-ASCII";
 		else if (strncmp(s, "NONE:", 5) == 0)
 			ret = (char *)(s + 5);
 		else