[hurd,commited,4/6] libio: Rename _FWRITE to FWRITE_FUNC

Message ID 20180129220048.28097-5-samuel.thibault@ens-lyon.org
State New
Headers show
Series
  • hurd: fixes against previous hurd commits
Related show

Commit Message

Samuel Thibault Jan. 29, 2018, 10 p.m.
_FWRITE would be in the reserved-namespace.

	* libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC.
	(do_test_bz20181): Rename accordingly.
---
 ChangeLog               |  2 ++
 libio/tst-memstream3.c  | 10 +++++-----
 libio/tst-wmemstream3.c |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

-- 
2.15.1

Patch

diff --git a/ChangeLog b/ChangeLog
index 476cb73847..2694f6d363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,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 df0da5bac5..bb3300dc57 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 4edc2b9094..f24f0facc6 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