Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/stdio: Remove bforce from lib_fflush[_unlocked]

Browse Source 
since all callers set bforce to true

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2023-10-22 04:47:22 +08:00
committed by Petro Karashchenko
parent c3be772441
commit 2c9511e655
13 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/libc.h
+2 -2
View File
@@ -211,8 +211,8 @@ FAR char *lib_fgets_unlocked(FAR char *buf, size_t buflen, FILE *stream,
/* Defined in lib_libfflush.c */
ssize_t lib_fflush(FAR FILE *stream, bool bforce);
ssize_t lib_fflush_unlocked(FAR FILE *stream, bool bforce);
ssize_t lib_fflush(FAR FILE *stream);
ssize_t lib_fflush_unlocked(FAR FILE *stream);
/* Defined in lib_rdflush_unlocked.c */
libs/libc/stdio/lib_fclose.c
+1 -1
View File
@@ -75,7 +75,7 @@ int fclose(FAR FILE *stream)
if ((stream->fs_oflags & O_WROK) != 0)
{
ret = lib_fflush(stream, true);
ret = lib_fflush(stream);
errcode = get_errno();
}
libs/libc/stdio/lib_fflush.c
+1 -1
View File
@@ -66,7 +66,7 @@ int fflush(FAR FILE *stream)
}
else
{
ret = lib_fflush(stream, true);
ret = lib_fflush(stream);
}
/* Check the return value */
libs/libc/stdio/lib_fputc.c
+1 -1
View File
@@ -45,7 +45,7 @@ int fputc_unlocked(int c, FAR FILE *stream)
if (c == '\n' && (stream->fs_flags & __FS_FLAG_LBF) != 0)
{
ret = lib_fflush_unlocked(stream, true);
ret = lib_fflush_unlocked(stream);
if (ret < 0)
{
return EOF;
libs/libc/stdio/lib_fputs.c
+2 -2
View File
@@ -67,7 +67,7 @@ int fputs_unlocked(FAR const IPTR char *s, FAR FILE *stream)
if (ch == '\n' && (stream->fs_flags & __FS_FLAG_LBF) != 0)
{
ret = lib_fflush_unlocked(stream, true);
ret = lib_fflush_unlocked(stream);
if (ret < 0)
{
return EOF;
@@ -107,7 +107,7 @@ int fputs_unlocked(FAR const IPTR char *s, FAR FILE *stream)
if (*s == '\n')
{
ret = lib_fflush_unlocked(stream, true);
ret = lib_fflush_unlocked(stream);
if (ret < 0)
{
return EOF;
libs/libc/stdio/lib_freopen.c
+1 -1
View File
@@ -106,7 +106,7 @@ FAR FILE *freopen(FAR const char *path, FAR const char *mode,
/* Flush the stream and invalidate the read buffer. */
lib_fflush_unlocked(stream, true);
lib_fflush_unlocked(stream);
#ifndef CONFIG_STDIO_DISABLE_BUFFERING
lib_rdflush_unlocked(stream);
libs/libc/stdio/lib_libfflush.c
+4 -5
View File
@@ -48,7 +48,6 @@
*
* Input Parameters:
* stream - the stream to flush
* bforce - flush must be complete.
*
* Returned Value:
* A negated errno value on failure, otherwise the number of bytes remaining
@@ -56,7 +55,7 @@
*
****************************************************************************/
ssize_t lib_fflush_unlocked(FAR FILE *stream, bool bforce)
ssize_t lib_fflush_unlocked(FAR FILE *stream)
{
#ifndef CONFIG_STDIO_DISABLE_BUFFERING
FAR const char *src;
@@ -137,7 +136,7 @@ ssize_t lib_fflush_unlocked(FAR FILE *stream, bool bforce)
src += bytes_written;
nbuffer -= bytes_written;
}
while (bforce && nbuffer > 0);
while (nbuffer > 0);
/* Reset the buffer position to the beginning of the buffer */
@@ -168,14 +167,14 @@ ssize_t lib_fflush_unlocked(FAR FILE *stream, bool bforce)
#endif
}
ssize_t lib_fflush(FAR FILE *stream, bool bforce)
ssize_t lib_fflush(FAR FILE *stream)
{
ssize_t ret;
/* Make sure that we have exclusive access to the stream */
flockfile(stream);
ret = lib_fflush_unlocked(stream, bforce);
ret = lib_fflush_unlocked(stream);
funlockfile(stream);
return ret;
}
libs/libc/stdio/lib_libflushall.c
+2 -2
View File
@@ -63,7 +63,7 @@ int lib_flushall(FAR struct streamlist *list)
for (i = 0; i < 3; i++)
{
lib_fflush(&list->sl_std[i], true);
lib_fflush(&list->sl_std[i]);
}
stream = list->sl_head;
@@ -77,7 +77,7 @@ int lib_flushall(FAR struct streamlist *list)
{
/* Flush the writable FILE */
ret = lib_fflush(stream, true);
ret = lib_fflush(stream);
if (ret < 0)
{
/* An error occurred during the flush AND/OR we were unable
libs/libc/stdio/lib_libfwrite.c
+1 -1
View File
@@ -130,7 +130,7 @@ ssize_t lib_fwrite_unlocked(FAR const void *ptr, size_t count,
{
/* Flush the buffered data to the IO stream */
int bytes_buffered = lib_fflush_unlocked(stream, true);
int bytes_buffered = lib_fflush_unlocked(stream);
if (bytes_buffered < 0)
{
goto errout;
libs/libc/stdio/lib_puts.c
+1 -1
View File
@@ -71,7 +71,7 @@ int puts(FAR const IPTR char *s)
if ((stream->fs_flags & __FS_FLAG_LBF) != 0)
{
ret = lib_fflush_unlocked(stream, true);
ret = lib_fflush_unlocked(stream);
if (ret < 0)
{
nput = EOF;
libs/libc/stdio/lib_wrflush_unlocked.c
+1 -1
View File
@@ -82,7 +82,7 @@ int lib_wrflush_unlocked(FAR FILE *stream)
* buffered write data was successfully flushed by lib_fflush().
*/
return lib_fflush_unlocked(stream, true);
return lib_fflush_unlocked(stream);
#else
/* Verify that we were passed a valid (i.e., non-NULL) stream */
libs/libc/stream/lib_stdoutstream.c
+1 -1
View File
@@ -113,7 +113,7 @@ static int stdoutstream_flush(FAR struct lib_outstream_s *self)
(FAR struct lib_stdoutstream_s *)self;
DEBUGASSERT(stream != NULL && stream->handle != NULL);
return lib_fflush(stream->handle, true);
return lib_fflush(stream->handle);
}
#endif
libs/libc/stream/lib_stdsostream.c
+1 -1
View File
@@ -112,7 +112,7 @@ static int stdsostream_flush(FAR struct lib_sostream_s *self)
(FAR struct lib_stdsostream_s *)self;
DEBUGASSERT(stream != NULL && stream->handle != NULL);
return lib_fflush(stream->handle, true);
return lib_fflush(stream->handle);
}
#endif