Deleted Added
sdiff udiff text old ( 92986 ) new ( 127100 )
full compact
ferror.c (92986) ferror.c (127100)
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[] = "@(#)ferror.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[] = "@(#)ferror.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/ferror.c 92986 2002-03-22 21:53:29Z obrien $");
41__FBSDID("$FreeBSD: head/lib/libc/stdio/ferror.c 127100 2004-03-17 01:43:08Z tjr $");
42
43#include "namespace.h"
44#include <stdio.h>
45#include "un-namespace.h"
46#include "libc_private.h"
47
42
43#include "namespace.h"
44#include <stdio.h>
45#include "un-namespace.h"
46#include "libc_private.h"
47
48/*
49 * ferror has traditionally been a macro in <stdio.h>. That is no
50 * longer true because it needs to be thread-safe.
51 *
52 * #undef ferror
53 */
48#undef ferror
49
54int
55ferror(FILE *fp)
56{
57 int ret;
58
59 FLOCKFILE(fp);
60 ret = __sferror(fp);
61 FUNLOCKFILE(fp);
62 return (ret);
63}
50int
51ferror(FILE *fp)
52{
53 int ret;
54
55 FLOCKFILE(fp);
56 ret = __sferror(fp);
57 FUNLOCKFILE(fp);
58 return (ret);
59}