Deleted Added
full compact
getchar.c (165903) getchar.c (178721)
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

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

29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#if defined(LIBC_SCCS) && !defined(lint)
34static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93";
35#endif /* LIBC_SCCS and not lint */
36#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

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

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