From fa8e78c070a3931a421f5833e47e4ce7d072c44a Mon Sep 17 00:00:00 2001
From: Max Okumoto <okumoto@dragonflybsd.org>
Date: Mon, 7 Feb 2005 20:09:45 +0000
Subject: [PATCH] - Reduce white space diffs after harti commited my change to
 FreeBSD. - Removed extra scope.

---
 usr.bin/make/buf.c |  3 ++-
 usr.bin/make/buf.h |  3 +--
 usr.bin/make/var.c | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 0377602e03..5f98b5fbab 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -39,7 +39,7 @@
  *
  * @(#)buf.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/make/buf.c,v 1.11 1999/09/11 13:08:01 hoek Exp $
- * $DragonFly: src/usr.bin/make/buf.c,v 1.31 2005/02/04 21:45:36 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/buf.c,v 1.32 2005/02/07 20:09:45 okumoto Exp $
  */
 
 /*
@@ -205,6 +205,7 @@ Buf_Append(Buffer *bp, const char str[])
 void
 Buf_AppendRange(Buffer *bp, const char str[], const char *end)
 {
+
 	Buf_AddBytes(bp, end - str, str);
 }
 
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 20450c3f9f..03bd13b0ac 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -38,7 +38,7 @@
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/make/buf.h,v 1.9 1999/08/28 01:03:26 peter Exp $
- * $DragonFly: src/usr.bin/make/buf.h,v 1.26 2005/02/01 22:05:36 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/buf.h,v 1.27 2005/02/07 20:09:45 okumoto Exp $
  */
 
 #ifndef buf_h_a61a6812
@@ -88,5 +88,4 @@ void Buf_Append(Buffer *, const char []);
 void Buf_AppendRange(Buffer *, const char [], const char *);
 void Buf_StripNewlines(Buffer *);
 
-
 #endif /* buf_h_a61a6812 */
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 4b93b56a30..e261c45ee1 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -37,7 +37,7 @@
  *
  * @(#)var.c	8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $
- * $DragonFly: src/usr.bin/make/var.c,v 1.64 2005/02/06 23:58:23 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/var.c,v 1.65 2005/02/07 20:09:45 okumoto Exp $
  */
 
 /*-
@@ -1575,11 +1575,12 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
 		case 's':
 		    if (tstr[1] == 'h' && (tstr[2] == endc || tstr[2] == ':')) {
 			const char *error;
-			{
-			    Buffer *buf = Cmd_Exec(str, &error);
-			    newStr = Buf_GetAll(buf, NULL);
-			    Buf_Destroy(buf, FALSE);
-			}
+			Buffer *buf;
+
+			buf = Cmd_Exec(str, &error);
+			newStr = Buf_GetAll(buf, NULL);
+			Buf_Destroy(buf, FALSE);
+
 			if (error)
 			    Error(error, str);
 			cp = tstr + 2;
-- 
2.41.0