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

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

This patch fixes a stack allocated variable to force it to have wchar_t
alignment.
This commit is contained in:
Adhemerval Zanella 2014-12-08 07:20:07 -05:00
parent c5c2b7c3fd
commit 2aa3862e86
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2014-12-06 Joseph Myers <joseph@codesourcery.com>
[BZ #17682] [BZ #17682]

5
libio/tst-ftell-active-handler.c
View File

@ -84,7 +84,6 @@ static const char *char_data = "abcdef";
static const wchar_t *wide_data = L"abcdef"; static const wchar_t *wide_data = L"abcdef";
static size_t data_len; static size_t data_len;
static size_t file_len; static size_t file_len;
static size_t char_len;
typedef int (*fputs_func_t) (const void *data, FILE *fp); typedef int (*fputs_func_t) (const void *data, FILE *fp);
typedef void *(*fgets_func_t) (void *ws, int n, FILE *fp); typedef void *(*fgets_func_t) (void *ws, int n, FILE *fp);
@ -365,7 +364,7 @@ do_ftell_test (const char *filename)
reading. */ reading. */
if (test_modes[i].fd_mode != O_WRONLY) if (test_modes[i].fd_mode != O_WRONLY)
{ {
char tmpbuf[data_len * char_len]; wchar_t tmpbuf[data_len];
rewind (fp); rewind (fp);
@ -657,7 +656,6 @@ do_test (void)
fgets_func = (fgets_func_t) fgets; fgets_func = (fgets_func_t) fgets;
data = char_data; data = char_data;
data_len = strlen (char_data); data_len = strlen (char_data);
char_len = sizeof (char);
ret |= do_one_test (filename); ret |= do_one_test (filename);
/* Truncate the file before repeating the tests in wide mode. */ /* Truncate the file before repeating the tests in wide mode. */
@ -680,7 +678,6 @@ do_test (void)
fgets_func = (fgets_func_t) fgetws; fgets_func = (fgets_func_t) fgetws;
data = wide_data; data = wide_data;
data_len = wcslen (wide_data); data_len = wcslen (wide_data);
char_len = sizeof (wchar_t);
ret |= do_one_test (filename); ret |= do_one_test (filename);
return ret; return ret;