From ed2bf9a99915f69dd0cd59defe6e0974c974a0f5 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Fri, 4 Apr 1997 19:07:02 +0000
Subject: [PATCH] Eliminate yet one function call when locale not used

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

diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index cb66eb95591c..14d7a3b7ab56 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: vfscanf.c,v 1.8 1997/03/03 17:53:02 bde Exp $";
+		"$Id: vfscanf.c,v 1.9 1997/04/04 18:28:38 ache Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -730,8 +730,9 @@ doswitch:
 			 */
 			n = *fmt;
 			if (n == ']'
-			    || (__collate_load_error && n < c)
-			    || __collate_range_cmp (n, c) < 0
+			    || (__collate_load_error ? n < c :
+				__collate_range_cmp (n, c) < 0
+			       )
 			   ) {
 				c = '-';
 				break;	/* resume the for(;;) */