drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CLEANUP_FILE define 

Define the configuration-dependent constant CLEANUP_FILE for use in
cleanup_stdio(). This will reduce duplicate code during the addition
of a dedicated stdio atexit handler in a follow-on patch.
This commit is contained in:
Matt Joyce 2022-05-03 06:29:36 +02:00 committed by Sebastian Huber
parent a7bdda0503
commit 4b28f3c125
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
newlib/libc/stdio/findfp.c
View File

@ -39,6 +39,21 @@ const struct __sFILE_fake __sf_fake_stderr =
__FILE __sf[3]; __FILE __sf[3];
#endif #endif
#ifdef _STDIO_BSD_SEMANTICS
/* BSD and Glibc systems only flush streams which have been written to
at exit time. Calling flush rather than close for speed, as on
the aforementioned systems. */
#define CLEANUP_FILE __sflushw_r
#else
/* Otherwise close files and flush read streams, too.
Note we call flush directly if "--enable-lite-exit" is in effect. */
#ifdef _LITE_EXIT
#define CLEANUP_FILE _fflush_r
#else
#define CLEANUP_FILE _fclose_r
#endif
#endif
#if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED)) #if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED))
_NOINLINE_STATIC void _NOINLINE_STATIC void
#else #else
@ -208,30 +223,15 @@ found:
static void static void
cleanup_stdio (struct _reent *ptr) cleanup_stdio (struct _reent *ptr)
{ {
int (*cleanup_func) (struct _reent *, FILE *);
#ifdef _STDIO_BSD_SEMANTICS
/* BSD and Glibc systems only flush streams which have been written to
at exit time. Calling flush rather than close for speed, as on
the aforementioned systems. */
cleanup_func = __sflushw_r;
#else
/* Otherwise close files and flush read streams, too.
Note we call flush directly if "--enable-lite-exit" is in effect. */
#ifdef _LITE_EXIT
cleanup_func = _fflush_r;
#else
cleanup_func = _fclose_r;
#endif
#endif
#ifdef _REENT_GLOBAL_STDIO_STREAMS #ifdef _REENT_GLOBAL_STDIO_STREAMS
if (ptr->_stdin != &__sf[0]) if (ptr->_stdin != &__sf[0])
(*cleanup_func) (ptr, ptr->_stdin); CLEANUP_FILE (ptr, ptr->_stdin);
if (ptr->_stdout != &__sf[1]) if (ptr->_stdout != &__sf[1])
(*cleanup_func) (ptr, ptr->_stdout); CLEANUP_FILE (ptr, ptr->_stdout);
if (ptr->_stderr != &__sf[2]) if (ptr->_stderr != &__sf[2])
(*cleanup_func) (ptr, ptr->_stderr); CLEANUP_FILE (ptr, ptr->_stderr);
#endif #endif
(void) _fwalk_reent (ptr, cleanup_func); (void) _fwalk_reent (ptr, CLEANUP_FILE);
} }
/* /*