diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
| commit | 4aa28d8ae279329f2b46c92e05b0bf457f07b9af (patch) | |
| tree | ff4d1723c92ad0f708643f70125baf16e2beaf49 /newlib/libc/stdio/fgetws.c | |
| parent | 75b6133098753a31b722f94b86e95b11323735f0 (diff) | |
| download | newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.zip newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.gz newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.bz2 | |
* 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.
Diffstat (limited to 'newlib/libc/stdio/fgetws.c')
| -rw-r--r-- | newlib/libc/stdio/fgetws.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c index 2784f15..cbfd84e 100644 --- a/newlib/libc/stdio/fgetws.c +++ b/newlib/libc/stdio/fgetws.c @@ -93,7 +93,7 @@ _DEFUN(_fgetws_r, (ptr, ws, n, fp), const char *src; unsigned char *nl; - _flockfile (fp); + _newlib_flockfile_start (fp); ORIENT (fp, 1); if (n <= 0) @@ -142,11 +142,11 @@ _DEFUN(_fgetws_r, (ptr, ws, n, fp), /* Incomplete character */ goto error; *wsp++ = L'\0'; - _funlockfile (fp); + _newlib_flockfile_exit (fp); return ws; error: - _funlockfile (fp); + _newlib_flockfile_end (fp); return NULL; } |