From owner-svn-src-head@freebsd.org  Thu May 18 01:46:32 2017
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 2A2C3D715FD;
 Thu, 18 May 2017 01:46:32 +0000 (UTC)
 (envelope-from ngie@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 EEA511DC5;
 Thu, 18 May 2017 01:46:31 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4I1kU6s047721;
 Thu, 18 May 2017 01:46:30 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4I1kU1R047720;
 Thu, 18 May 2017 01:46:30 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201705180146.v4I1kU1R047720@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 18 May 2017 01:46:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318437 - head/usr.bin/getconf
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.23
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: Thu, 18 May 2017 01:46:32 -0000

Author: ngie
Date: Thu May 18 01:46:30 2017
New Revision: 318437
URL: https://svnweb.freebsd.org/changeset/base/318437

Log:
  Revert local changes to find_progenv accidentally committed in r318436
  
  MFC after:	2 weeks
  MFC with:	r318436
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.bin/getconf/getconf.h

Modified: head/usr.bin/getconf/getconf.h
==============================================================================
--- head/usr.bin/getconf/getconf.h	Thu May 18 01:43:30 2017	(r318436)
+++ head/usr.bin/getconf/getconf.h	Thu May 18 01:46:30 2017	(r318437)
@@ -36,15 +36,8 @@ typedef long long intmax_t;
 #include <inttypes.h>
 #endif
 
-typedef enum {
-	PROG_ENV_VALID_NO_ALT_PATH = -1,
-	PROG_ENV_INVALID = 0,
-	PROG_ENV_VALID_HAS_ALT_PATH = 1,
-	PROG_ENV_UNKNOWN = 2,
-} prog_env_validity;
-
 int	find_confstr(const char *name, int *key);
 int	find_limit(const char *name, intmax_t *value);
 int	find_pathconf(const char *name, int *key);
-prog_env_validity	find_progenv(const char *name, const char **alt_path);
+int	find_progenv(const char *name, const char **alt_path);
 int	find_sysconf(const char *name, int *key);