From 2ae357921f1caf25d89dd805c770627c98b3b912 Mon Sep 17 00:00:00 2001
From: skimo <skimo>
Date: Tue, 1 Jan 2002 11:28:18 +0000
Subject: [PATCH] Avoid unused variable warning, while keeping check for type.

---
 common/mem.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/mem.h b/common/mem.h
index 6a68b58c..d3432995 100644
--- a/common/mem.h
+++ b/common/mem.h
@@ -6,7 +6,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- *	$Id: mem.h,v 10.11 2000/08/20 09:12:59 skimo Exp $ (Berkeley) $Date: 2000/08/20 09:12:59 $
+ *	$Id: mem.h,v 10.12 2002/01/01 11:28:18 skimo Exp $ (Berkeley) $Date: 2002/01/01 11:28:18 $
  */
 
 /* Increase the size of a malloc'd buffer.  Two versions, one that
@@ -16,7 +16,7 @@
 	char *L__p = lp;						\
 	void *L__bincp;							\
 	if ((nlen) > llen) {						\
-		if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL)	\
+		if ((L__bincp = binc(sp, L__p, &(llen), nlen)) == NULL)	\
 			goto alloc_err;					\
 		/*							\
 		 * !!!							\
@@ -25,15 +25,15 @@
 		lp = L__bincp;						\
 	}								\
 }
-#define	BINC_GOTOW(sp, lp, llen, nlen) {					\
+#define	BINC_GOTOW(sp, lp, llen, nlen) {				\
 	CHAR_T *L__bp = lp;						\
-	BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))    	\
+	BINC_GOTO(sp, (char *)L__bp, llen, (nlen) * sizeof(CHAR_T))    	\
 }
 #define	BINC_RET(sp, lp, llen, nlen) {					\
 	char *L__p = lp;						\
 	void *L__bincp;							\
 	if ((nlen) > llen) {						\
-		if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL)	\
+		if ((L__bincp = binc(sp, L__p, &(llen), nlen)) == NULL)	\
 			return (1);					\
 		/*							\
 		 * !!!							\
@@ -44,7 +44,7 @@
 }
 #define	BINC_RETW(sp, lp, llen, nlen) {					\
 	CHAR_T *L__bp = lp;						\
-	BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))	    	\
+	BINC_RET(sp, (char *)L__bp, llen, (nlen) * sizeof(CHAR_T))    	\
 }
 
 /*
@@ -67,7 +67,7 @@
 }
 #define	GET_SPACE_GOTOW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	GET_SPACE_GOTO(sp, (char *)L__bp, blen, (nlen) * sizeof(CHAR_T))\
 }
 #define	GET_SPACE_RET(sp, bp, blen, nlen) {				\
 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
@@ -84,7 +84,7 @@
 }
 #define	GET_SPACE_RETW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	GET_SPACE_RET(sp, (char *)L__bp, blen, (nlen) * sizeof(CHAR_T))	\
 }
 
 /*
@@ -104,7 +104,7 @@
 }
 #define	ADD_SPACE_GOTOW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	ADD_SPACE_GOTO(sp, (char *)L__bp, blen, (nlen) * sizeof(CHAR_T))\
 }
 #define	ADD_SPACE_RET(sp, bp, blen, nlen) {				\
 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
@@ -119,7 +119,7 @@
 }
 #define	ADD_SPACE_RETW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	ADD_SPACE_RET(sp, (char *)L__bp, blen, (nlen) * sizeof(CHAR_T))	\
 }
 
 /* Free a GET_SPACE returned buffer. */
@@ -132,7 +132,7 @@
 }
 #define	FREE_SPACEW(sp, bp, blen) {					\
 	CHAR_T *L__bp = bp;						\
-	FREE_SPACE(sp, (char *)bp, blen);				\
+	FREE_SPACE(sp, (char *)L__bp, blen);				\
 }
 
 /*
-- 
2.11.4.GIT