qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libio: Rename _FWRITE to FWRITE_FUNC 

_FWRITE would be in the reserved-namespace.

	* libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC.
	(do_test_bz20181): Rename accordingly.
This commit is contained in:
Samuel Thibault 2018-01-29 22:44:46 +01:00
parent ba729de643
commit 2aadb70562
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21,6 +21,8 @@
* sysdeps/mach/hurd/i386/libutil.abilist: New file. * sysdeps/mach/hurd/i386/libutil.abilist: New file.
* sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
|| to respect codestyle. || to respect codestyle.
* libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC.
(do_test_bz20181): Rename accordingly.
2018-01-29 Darius Rad <darius@bluespec.com> 2018-01-29 Darius Rad <darius@bluespec.com>

10
libio/tst-memstream3.c
View File

@ -29,7 +29,7 @@
# define W(o) o # define W(o) o
# define OPEN_MEMSTREAM open_memstream # define OPEN_MEMSTREAM open_memstream
# define PRINTF printf # define PRINTF printf
# define _FWRITE fwrite # define FWRITE_FUNC fwrite
# define FPUTC fputc # define FPUTC fputc
# define STRCMP strcmp # define STRCMP strcmp
#endif #endif
@ -114,14 +114,14 @@ do_test_bz20181 (void)
if (fp == NULL) if (fp == NULL)
ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM)); ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM));
if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3) if ((ret = FWRITE_FUNC (W("abc"), 1, 3, fp)) != 3)
ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno);
if (fseek (fp, 0, SEEK_SET) != 0) if (fseek (fp, 0, SEEK_SET) != 0)
ERROR_RET1 ("fseek failed (errno = %d)\n", errno); ERROR_RET1 ("fseek failed (errno = %d)\n", errno);
if (_FWRITE (W("z"), 1, 1, fp) != 1) if (FWRITE_FUNC (W("z"), 1, 1, fp) != 1)
ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno);
if (fflush (fp) != 0) if (fflush (fp) != 0)
ERROR_RET1 ("fflush failed (errno = %d)\n", errno); ERROR_RET1 ("fflush failed (errno = %d)\n", errno);

2
libio/tst-wmemstream3.c
View File

@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq)
#define W(o) L##o #define W(o) L##o
#define OPEN_MEMSTREAM open_wmemstream #define OPEN_MEMSTREAM open_wmemstream
#define PRINTF wprintf #define PRINTF wprintf
#define _FWRITE fwwrite #define FWRITE_FUNC fwwrite
#define FPUTC fputwc #define FPUTC fputwc
#define STRCMP wcscmp #define STRCMP wcscmp