From 63b01047f4f6aae3f94266469050c5cb81dd32a6 Mon Sep 17 00:00:00 2001
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Thu, 17 Oct 2002 12:06:29 +0000
Subject: [PATCH] Make part of the previous change clearer; check flags for
 SUPPRESS directly instead of checking whether we're using a temporary buffer.

---
 lib/libc/stdio/vfscanf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 977bfc9cd5e0..6aebd60783fc 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -379,12 +379,12 @@ again:		c = *fmt++;
 						fp->_flags |= __SERR;
 						goto input_failure;
 					}
-					if (nconv == 0 && wcp != NULL)
+					if (nconv == 0 && !(flags & SUPPRESS))
 						*wcp = L'\0';
 					if (nconv != (size_t)-2) {
 						nread += n;
 						width--;
-						if (wcp != NULL)
+						if (!(flags & SUPPRESS))
 							wcp++;
 						n = 0;
 					}
@@ -396,7 +396,7 @@ again:		c = *fmt++;
 						break;
 					}
 				}
-				if (wcp != NULL)
+				if (!(flags & SUPPRESS))
 					nassigned++;
 			} else if (flags & SUPPRESS) {
 				size_t sum = 0;
@@ -471,7 +471,7 @@ again:		c = *fmt++;
 						}
 						nread += n;
 						width--;
-						if (wcp != &twc)
+						if (!(flags & SUPPRESS))
 							wcp++;
 						nchars++;
 						n = 0;
@@ -491,7 +491,7 @@ again:		c = *fmt++;
 				n = nchars;
 				if (n == 0)
 					goto match_failure;
-				if (wcp != &twc) {
+				if (!(flags & SUPPRESS)) {
 					*wcp = L'\0';
 					nassigned++;
 				}
@@ -569,7 +569,7 @@ again:		c = *fmt++;
 						}
 						nread += n;
 						width--;
-						if (wcp != &twc)
+						if (!(flags & SUPPRESS))
 							wcp++;
 						n = 0;
 					}
@@ -581,7 +581,7 @@ again:		c = *fmt++;
 						break;
 					}
 				}
-				if (wcp != &twc) {
+				if (!(flags & SUPPRESS)) {
 					*wcp = L'\0';
 					nassigned++;
 				}