From 4aa28d8ae279329f2b46c92e05b0bf457f07b9af Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 30 May 2012 08:58:42 +0000 Subject: * libc/stdio/local.h (_newlib_flockfile_start): New macro to secure stream related critical section against thread cancellation. (_newlib_flockfile_exit): Ditto. (_newlib_sfp_lock_end): Ditto. (_newlib_sfp_lock_start): Ditto for the list of streams. (_newlib_sfp_lock_exit): Ditto. (_newlib_sfp_lock_end): Ditto. Use aforementioned macros in place of _flockfile/_funlockfile and __sfp_lock_acquire/__sfp_lock_release throughout the code. * libc/stdio/fclose.c: Explicitely disable and re-enable thread cancellation. Explain why. * libc/stdio/freopen.c: Ditto. * libc/stdio64/freopen64.c: Ditto. --- newlib/libc/stdio/getc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'newlib/libc/stdio/getc.c') diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c index 5b1fa888a..355b19131 100644 --- a/newlib/libc/stdio/getc.c +++ b/newlib/libc/stdio/getc.c @@ -92,9 +92,9 @@ _DEFUN(_getc_r, (ptr, fp), { int result; CHECK_INIT (ptr, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); result = __sgetc_r (ptr, fp); - _funlockfile (fp); + _newlib_flockfile_end (fp); return result; } @@ -106,9 +106,9 @@ _DEFUN(getc, (fp), { int result; CHECK_INIT (_REENT, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); result = __sgetc_r (_REENT, fp); - _funlockfile (fp); + _newlib_flockfile_end (fp); return result; } -- cgit v1.2.3