From owner-svn-src-stable-11@freebsd.org  Thu Jun  1 06:42:23 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 09A2EB7D344;
 Thu,  1 Jun 2017 06:42:23 +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 C34D066924;
 Thu,  1 Jun 2017 06:42:22 +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 v516gLnf081248;
 Thu, 1 Jun 2017 06:42:21 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v516gLfQ081247;
 Thu, 1 Jun 2017 06:42:21 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201706010642.v516gLfQ081247@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, 1 Jun 2017 06:42:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r319387 - stable/11/usr.bin/getconf
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2017 06:42:23 -0000

Author: ngie
Date: Thu Jun  1 06:42:21 2017
New Revision: 319387
URL: https://svnweb.freebsd.org/changeset/base/319387

Log:
  MFC r318437:
  
  Revert local changes to find_progenv accidentally committed in r318436
  
  MFC with:	r318436

Modified:
  stable/11/usr.bin/getconf/getconf.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/getconf/getconf.h
==============================================================================
--- stable/11/usr.bin/getconf/getconf.h	Thu Jun  1 06:42:20 2017	(r319386)
+++ stable/11/usr.bin/getconf/getconf.h	Thu Jun  1 06:42:21 2017	(r319387)
@@ -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);