patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

libc: Fix fwrite function name

Browse source 
Commit 4344e27c26 changed the reserved
function names, but got the naming wrong for fwrite.  Just use the
name zephyr_fwrite everywhere.

Fixes #14275

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-03-11 15:47:33 -05:00 committed by Kumar Gala
parent c1a18fb514
commit c82f23cada
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/misc/libc-hooks.h
View file

@ -32,7 +32,7 @@ __syscall int z_zephyr_write_stdout(const void *buf, int nbytes);
__syscall int _zephyr_fputc(int c, FILE *stream);
__syscall size_t z_zephyr_fwrite(const void *_MLIBC_RESTRICT ptr, size_t size,
__syscall size_t zephyr_fwrite(const void *_MLIBC_RESTRICT ptr, size_t size,
size_t nitems, FILE *_MLIBC_RESTRICT stream);
#endif /* CONFIG_NEWLIB_LIBC */

8
lib/libc/minimal/source/stdout/stdout_console.c
View file

@ -52,7 +52,7 @@ int fputs(const char *_MLIBC_RESTRICT string, FILE *_MLIBC_RESTRICT stream)
return len == ret ? 0 : EOF;
}
size_t z_impl__zephyr_fwrite(const void *_MLIBC_RESTRICT ptr, size_t size,
size_t z_impl_zephyr_fwrite(const void *_MLIBC_RESTRICT ptr, size_t size,
size_t nitems, FILE *_MLIBC_RESTRICT stream)
{
size_t i;
@ -82,11 +82,11 @@ done:
}
#ifdef CONFIG_USERSPACE
Z_SYSCALL_HANDLER(z_zephyr_fwrite, ptr, size, nitems, stream)
Z_SYSCALL_HANDLER(zephyr_fwrite, ptr, size, nitems, stream)
{
Z_OOPS(Z_SYSCALL_MEMORY_ARRAY_READ(ptr, nitems, size));
return z_impl__zephyr_fwrite((const void *_MLIBC_RESTRICT)ptr, size,
return z_impl_zephyr_fwrite((const void *_MLIBC_RESTRICT)ptr, size,
nitems, (FILE *_MLIBC_RESTRICT)stream);
}
#endif
@ -94,7 +94,7 @@ Z_SYSCALL_HANDLER(z_zephyr_fwrite, ptr, size, nitems, stream)
size_t fwrite(const void *_MLIBC_RESTRICT ptr, size_t size, size_t nitems,
FILE *_MLIBC_RESTRICT stream)
{
return z_zephyr_fwrite(ptr, size, nitems, stream);
return zephyr_fwrite(ptr, size, nitems, stream);
}