diff options
| author | ache <ache@FreeBSD.org> | 1997-04-04 19:07:02 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-04-04 19:07:02 +0000 |
| commit | 8dc8604567aaa7a93f829dc606f088230bbbf5b5 (patch) | |
| tree | fd0db4d21909b1c893d3b01c5a5aceac8077877b /lib/libc/stdio | |
| parent | 9f599254e5f962e4d5f614b2fce1409bb1362462 (diff) | |
| download | FreeBSD-src-8dc8604567aaa7a93f829dc606f088230bbbf5b5.zip FreeBSD-src-8dc8604567aaa7a93f829dc606f088230bbbf5b5.tar.gz | |
Eliminate yet one function call when locale not used
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/vfscanf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index cb66eb9..14d7a3b 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(;;) */ |
