From owner-svn-src-head@freebsd.org  Wed May 10 22:24:10 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 6E681D667C0;
 Wed, 10 May 2017 22:24:10 +0000 (UTC) (envelope-from sjg@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 353C5ACF;
 Wed, 10 May 2017 22:24:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4AMO9Ob078719;
 Wed, 10 May 2017 22:24:09 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4AMO9SQ078718;
 Wed, 10 May 2017 22:24:09 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201705102224.v4AMO9SQ078718@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 10 May 2017 22:24:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318161 - head/contrib/bmake
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: Wed, 10 May 2017 22:24:10 -0000

Author: sjg
Date: Wed May 10 22:24:09 2017
New Revision: 318161
URL: https://svnweb.freebsd.org/changeset/base/318161

Log:
  Ensure buf2 is in scope

Modified:
  head/contrib/bmake/main.c

Modified: head/contrib/bmake/main.c
==============================================================================
--- head/contrib/bmake/main.c	Wed May 10 22:13:47 2017	(r318160)
+++ head/contrib/bmake/main.c	Wed May 10 22:24:09 2017	(r318161)
@@ -751,6 +751,7 @@ Main_SetObjdir(const char *fmt, ...)
 	struct stat sb;
 	char *path;
 	char buf[MAXPATHLEN + 1];
+	char buf2[MAXPATHLEN + 1];
 	Boolean rc = FALSE;
 	va_list ap;
 
@@ -759,8 +760,6 @@ Main_SetObjdir(const char *fmt, ...)
 	va_end(ap);
 
 	if (path[0] != '/') {
-		char buf2[MAXPATHLEN + 1];
-		
 		snprintf(buf2, MAXPATHLEN, "%s/%s", curdir, path);
 		path = buf2;
 	}