diff options
| author | Florian Weimer <fweimer@redhat.com> | 2015-05-18 13:58:54 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2015-05-22 11:40:04 +0200 |
| commit | e69dcccbcb53b2c0f3fbe3f6c3e04aadae7e9265 (patch) | |
| tree | 9f68baa8c17a343946e69357767909297843c5c1 /libio/fileops.c | |
| parent | 9124ccf76abc5a2ffe4603e6424b1dc2b5a5db44 (diff) | |
| download | glibc-e69dcccbcb53b2c0f3fbe3f6c3e04aadae7e9265.tar.gz glibc-e69dcccbcb53b2c0f3fbe3f6c3e04aadae7e9265.tar.xz glibc-e69dcccbcb53b2c0f3fbe3f6c3e04aadae7e9265.zip | |
Avoid some aliasing violations in libio
Diffstat (limited to 'libio/fileops.c')
| -rw-r--r-- | libio/fileops.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index 2427320325..966802443c 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -414,7 +414,7 @@ _IO_new_file_fopen (_IO_FILE *fp, const char *filename, const char *mode, &result->_wide_data->_IO_state; /* From now on use the wide character callback functions. */ - ((struct _IO_FILE_plus *) fp)->vtable = fp->_wide_data->_wide_vtable; + _IO_JUMPS_FILE_plus (fp) = fp->_wide_data->_wide_vtable; /* Set the mode now. */ result->_mode = 1; @@ -466,7 +466,7 @@ _IO_file_setbuf_mmap (_IO_FILE *fp, char *p, _IO_ssize_t len) _IO_FILE *result; /* Change the function table. */ - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; + _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; /* And perform the normal operation. */ @@ -475,7 +475,7 @@ _IO_file_setbuf_mmap (_IO_FILE *fp, char *p, _IO_ssize_t len) /* If the call failed, restore to using mmap. */ if (result == NULL) { - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps_mmap; + _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps_mmap; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps_mmap; } @@ -703,9 +703,9 @@ mmap_remap_check (_IO_FILE *fp) fp->_IO_buf_base = fp->_IO_buf_end = NULL; _IO_setg (fp, NULL, NULL, NULL); if (fp->_mode <= 0) - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; + _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps; else - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_wfile_jumps; + _IO_JUMPS_FILE_plus (fp) = &_IO_wfile_jumps; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; return 1; @@ -773,9 +773,9 @@ decide_maybe_mmap (_IO_FILE *fp) fp->_offset = st.st_size; if (fp->_mode <= 0) - _IO_JUMPS ((struct _IO_FILE_plus *)fp) = &_IO_file_jumps_mmap; + _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps_mmap; else - _IO_JUMPS ((struct _IO_FILE_plus *)fp) = &_IO_wfile_jumps_mmap; + _IO_JUMPS_FILE_plus (fp) = &_IO_wfile_jumps_mmap; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps_mmap; return; @@ -786,9 +786,9 @@ decide_maybe_mmap (_IO_FILE *fp) /* We couldn't use mmap, so revert to the vanilla file operations. */ if (fp->_mode <= 0) - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps; + _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps; else - _IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_wfile_jumps; + _IO_JUMPS_FILE_plus (fp) = &_IO_wfile_jumps; fp->_wide_data->_wide_vtable = &_IO_wfile_jumps; } |