Deleted Added
full compact
ferror.c (50476) ferror.c (72373)
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

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

34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38#if 0
39static char sccsid[] = "@(#)ferror.c 8.1 (Berkeley) 6/4/93";
40#endif
41static const char rcsid[] =
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

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

34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38#if 0
39static char sccsid[] = "@(#)ferror.c 8.1 (Berkeley) 6/4/93";
40#endif
41static const char rcsid[] =
42 "$FreeBSD: head/lib/libc/stdio/ferror.c 50476 1999-08-28 00:22:10Z peter $";
42 "$FreeBSD: head/lib/libc/stdio/ferror.c 72373 2001-02-11 22:06:43Z deischen $";
43#endif /* LIBC_SCCS and not lint */
44
43#endif /* LIBC_SCCS and not lint */
44
45#include "namespace.h"
45#include <stdio.h>
46#include <stdio.h>
47#include "un-namespace.h"
48#include "libc_private.h"
46
47/*
49
50/*
48 * A subroutine version of the macro ferror.
51 * ferror has traditionally been a macro in <stdio.h>. That is no
52 * longer true because it needs to be thread-safe.
53 *
54 * #undef ferror
49 */
55 */
50#undef ferror
51
52int
56int
53ferror(fp)
54 FILE *fp;
57ferror(FILE *fp)
55{
58{
56 return (__sferror(fp));
59 int ret;
60
61 FLOCKFILE(fp);
62 ret = __sferror(fp);
63 FUNLOCKFILE(fp);
64 return (ret);
57}
65}