aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-29 22:44:46 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-29 23:00:17 +0100
commit2aadb70562feae948ed093c86808e7331c5bc6bd (patch)
tree1f1a8bf592a3b8db28533df6736174088133378c
parentba729de6436ea0a8af3ad80f9555cf3161c7694b (diff)
downloadglibc-2aadb70562feae948ed093c86808e7331c5bc6bd.zip
glibc-2aadb70562feae948ed093c86808e7331c5bc6bd.tar.gz
glibc-2aadb70562feae948ed093c86808e7331c5bc6bd.tar.bz2
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.
-rw-r--r--ChangeLog2
-rw-r--r--libio/tst-memstream3.c10
-rw-r--r--libio/tst-wmemstream3.c2
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c86e6a2..3060b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
* sysdeps/mach/hurd/i386/libutil.abilist: New file.
* sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
|| 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>
diff --git a/libio/tst-memstream3.c b/libio/tst-memstream3.c
index df0da5b..bb3300d 100644
--- a/libio/tst-memstream3.c
+++ b/libio/tst-memstream3.c
@@ -29,7 +29,7 @@
# define W(o) o
# define OPEN_MEMSTREAM open_memstream
# define PRINTF printf
-# define _FWRITE fwrite
+# define FWRITE_FUNC fwrite
# define FPUTC fputc
# define STRCMP strcmp
#endif
@@ -114,14 +114,14 @@ do_test_bz20181 (void)
if (fp == NULL)
ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM));
- if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3)
- ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
+ if ((ret = FWRITE_FUNC (W("abc"), 1, 3, fp)) != 3)
+ ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno);
if (fseek (fp, 0, SEEK_SET) != 0)
ERROR_RET1 ("fseek failed (errno = %d)\n", errno);
- if (_FWRITE (W("z"), 1, 1, fp) != 1)
- ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
+ if (FWRITE_FUNC (W("z"), 1, 1, fp) != 1)
+ ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno);
if (fflush (fp) != 0)
ERROR_RET1 ("fflush failed (errno = %d)\n", errno);
diff --git a/libio/tst-wmemstream3.c b/libio/tst-wmemstream3.c
index 4edc2b9..f24f0fa 100644
--- a/libio/tst-wmemstream3.c
+++ b/libio/tst-wmemstream3.c
@@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq)
#define W(o) L##o
#define OPEN_MEMSTREAM open_wmemstream
#define PRINTF wprintf
-#define _FWRITE fwwrite
+#define FWRITE_FUNC fwwrite
#define FPUTC fputwc
#define STRCMP wcscmp