GNU C Library master sources branch master updated. glibc-2.20-308-g2aa3862

[azanella at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2aa3862e86ba6c63c78032e439c0d8e16ce256e5 (commit)
      from  c5c2b7c3fd823fc5c4a52506292a90eba60b0c62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2aa3862e86ba6c63c78032e439c0d8e16ce256e5

commit 2aa3862e86ba6c63c78032e439c0d8e16ce256e5
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date:   Mon Dec 8 07:20:07 2014 -0500

    libio: Fix variable aligment in tst-ftell-active-handler
    
    This patch fixes a stack allocated variable to force it to have wchar_t
    alignment.

diff --git a/ChangeLog b/ChangeLog
index 676fd0e..ea4e555 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 44a4fac..6151554 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;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    5 +++++
 libio/tst-ftell-active-handler.c |    5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources