Deleted Added
full compact
getchar.c (126804) getchar.c (127198)
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Chris Torek.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 24 unchanged lines hidden (view full) ---

33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93";
39#endif /* LIBC_SCCS and not lint */
40#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Chris Torek.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 24 unchanged lines hidden (view full) ---

33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93";
39#endif /* LIBC_SCCS and not lint */
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/lib/libc/stdio/getchar.c 126804 2004-03-10 10:24:15Z tjr $");
41__FBSDID("$FreeBSD: head/lib/libc/stdio/getchar.c 127198 2004-03-19 09:04:56Z tjr $");
42
43/*
44 * A subroutine version of the macro getchar.
45 */
46#include "namespace.h"
47#include <stdio.h>
48#include "un-namespace.h"
49#include "local.h"
50#include "libc_private.h"
51
52#undef getchar
53
54int
55getchar()
56{
57 int retval;
58 FLOCKFILE(stdin);
42
43/*
44 * A subroutine version of the macro getchar.
45 */
46#include "namespace.h"
47#include <stdio.h>
48#include "un-namespace.h"
49#include "local.h"
50#include "libc_private.h"
51
52#undef getchar
53
54int
55getchar()
56{
57 int retval;
58 FLOCKFILE(stdin);
59 ORIENT(stdin, -1);
59 /* Orientation set by __sgetc() when buffer is empty. */
60 /* ORIENT(stdin, -1); */
60 retval = __sgetc(stdin);
61 FUNLOCKFILE(stdin);
62 return (retval);
63}
61 retval = __sgetc(stdin);
62 FUNLOCKFILE(stdin);
63 return (retval);
64}