libio: Fix variable aligment in tst-ftell-active-handler

This patch fixes a stack allocated variable to force it to have wchar_t
alignment.

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 676fd0ee60..ea4e555ab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-08  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* libio/tst-ftell-active-handler.c (do_ftell_test): Fix wide-character
+	stack variable alignment.
+
 2014-12-06  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #17682]
diff --git a/libio/tst-ftell-active-handler.c b/libio/tst-ftell-active-handler.c
index 44a4facaf7..6151554ffd 100644
--- a/libio/tst-ftell-active-handler.c
+++ b/libio/tst-ftell-active-handler.c
@@ -84,7 +84,6 @@ static const char *char_data = "abcdef";
 static const wchar_t *wide_data = L"abcdef";
 static size_t data_len;
 static size_t file_len;
-static size_t char_len;
 
 typedef int (*fputs_func_t) (const void *data, FILE *fp);
 typedef void *(*fgets_func_t) (void *ws, int n, FILE *fp);
@@ -365,7 +364,7 @@ do_ftell_test (const char *filename)
 	     reading.  */
 	  if (test_modes[i].fd_mode != O_WRONLY)
 	    {
-	      char tmpbuf[data_len * char_len];
+	      wchar_t tmpbuf[data_len];
 
 	      rewind (fp);
 
@@ -657,7 +656,6 @@ do_test (void)
   fgets_func = (fgets_func_t) fgets;
   data = char_data;
   data_len = strlen (char_data);
-  char_len = sizeof (char);
   ret |= do_one_test (filename);
 
   /* Truncate the file before repeating the tests in wide mode.  */
@@ -680,7 +678,6 @@ do_test (void)
   fgets_func = (fgets_func_t) fgetws;
   data = wide_data;
   data_len = wcslen (wide_data);
-  char_len = sizeof (wchar_t);
   ret |= do_one_test (filename);
 
   return ret;