OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove _G_OPEN64, _G_LSEEK64, _G_MMAP64, _G_FSTAT64 from _G_config.h.

This commit is contained in:
Joseph Myers 2012-10-18 18:50:43 +00:00
parent b741de23e2
commit ced52c719c
12 changed files with 68 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ChangeLog
View File

@ -1,3 +1,59 @@
2012-10-18 Joseph Myers <joseph@codesourcery.com>
* sysdeps/generic/_G_config.h (_G_OPEN64): Remove.
(_G_LSEEK64): Likewise.
(_G_MMAP64): Likewise.
(_G_FSTAT64): Likewise.
* sysdeps/unix/sysv/linux/_G_config.h (_G_OPEN64): Remove.
(_G_LSEEK64): Likewise.
(_G_MMAP64): Likewise.
(_G_FSTAT64): Likewise.
* libio/fileops.c (mmap_remap_check) [_G_MMAP64]: Make code
unconditional. Call __mmap64 directly.
(mmap_remap_check) [!_G_MMAP64]: Remove conditional code.
(mmap_remap_check) [_G_LSEEK64]: Make code unconditional. Call
__lseek64 directly.
(mmap_remap_check) [!_G_LSEEK64]: Remove conditional code.
(decide_maybe_mmap) [_G_MMAP64]: Make code unconditional. Call
__mmap64 directly.
(decide_maybe_mmap) [!_G_MMAP64]: Remove conditional code.
(decide_maybe_mmap) [_G_LSEEK64]: Make code unconditional. Call
__lseek64 directly.
(decide_maybe_mmap) [!_G_LSEEK64]: Remove conditional code.
(_IO_file_sync_mmap) [_G_LSEEK64]: Make code unconditional. Call
__lseek64 directly.
(_IO_file_sync_mmap) [!_G_LSEEK64]: Remove conditional code.
(_IO_file_seek) [_G_LSEEK64]: Make code unconditional. Call
__lseek64 directly.
(_IO_file_seek) [!_G_LSEEK64]: Remove conditional code.
(_IO_file_stat) [_G_FSTAT64]: Make code unconditional. Call
__fxstat64 directly.
(_IO_file_stat) [!_G_FSTAT64]: Remove conditional code.
* libio/freopen64.c (freopen64) [_G_OPEN64]: Make code
unconditional.
(freopen64) [!_G_OPEN64]: Remove conditional code.
* libio/fseeko64.c (fseeko64) [_G_LSEEK64]: Make code
unconditional.
(fseeko64) [!_G_LSEEK64]: Remove conditional code.
* libio/ftello64.c (ftello64) [_G_LSEEK64]: Make code
unconditional.
(ftello64) [!_G_LSEEK64]: Remove conditional code.
* libio/iofgetpos64.c (_IO_new_fgetpos64) [_G_LSEEK64]: Make code
unconditional.
(_IO_new_fgetpos64) [!_G_LSEEK64]: Remove conditional code.
* libio/iofopen64.c (_IO_fopen64) [_G_OPEN64]: Make code
unconditional.
(_IO_fopen64) [!_G_OPEN64]: Remove conditional code.
* libio/iofsetpos64.c (_IO_new_fsetpos64) [_G_LSEEK64]: Make code
unconditional.
(_IO_new_fsetpos64) [!_G_LSEEK64]: Remove conditional code.
* libio/oldiofgetpos64.c (_IO_old_fgetpos64) [_G_LSEEK64]: Make code
unconditional.
(_IO_old_fgetpos64) [!_G_LSEEK64]: Remove conditional code.
* libio/oldiofsetpos64.c (_IO_old_fsetpos64) [_G_LSEEK64]: Make code
unconditional.
(_IO_old_fsetpos64) [!_G_LSEEK64]: Remove conditional code.
2012-10-18 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #12140]

53
libio/fileops.c
View File

@ -671,13 +671,8 @@ mmap_remap_check (_IO_FILE *fp)
#else
(void) __munmap (fp->_IO_buf_base,
fp->_IO_buf_end - fp->_IO_buf_base);
# ifdef _G_MMAP64
p = _G_MMAP64 (NULL, st.st_size, PROT_READ, MAP_SHARED,
fp->_fileno, 0);
# else
p = __mmap (NULL, st.st_size, PROT_READ, MAP_SHARED,
fp->_fileno, 0);
# endif
p = __mmap64 (NULL, st.st_size, PROT_READ, MAP_SHARED,
fp->_fileno, 0);
if (p == MAP_FAILED)
goto punt;
#endif
@ -704,13 +699,8 @@ mmap_remap_check (_IO_FILE *fp)
if (fp->_offset < fp->_IO_buf_end - fp->_IO_buf_base)
{
if (
# ifdef _G_LSEEK64
_G_LSEEK64
# else
__lseek
# endif
(fp->_fileno, fp->_IO_buf_end - fp->_IO_buf_base, SEEK_SET)
if (__lseek64 (fp->_fileno, fp->_IO_buf_end - fp->_IO_buf_base,
SEEK_SET)
!= fp->_IO_buf_end - fp->_IO_buf_base)
fp->_flags |= _IO_ERR_SEEN;
else
@ -775,24 +765,14 @@ decide_maybe_mmap (_IO_FILE *fp)
/* Try to map the file. */
void *p;
# ifdef _G_MMAP64
p = _G_MMAP64 (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
# else
p = __mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
# endif
p = __mmap64 (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
if (p != MAP_FAILED)
{
/* OK, we managed to map the file. Set the buffer up and use a
special jump table with simplified underflow functions which
never tries to read anything from the file. */
if (
# ifdef _G_LSEEK64
_G_LSEEK64
# else
__lseek
# endif
(fp->_fileno, st.st_size, SEEK_SET) != st.st_size)
if (__lseek64 (fp->_fileno, st.st_size, SEEK_SET) != st.st_size)
{
(void) __munmap (p, st.st_size);
fp->_offset = _IO_pos_BAD;
@ -944,13 +924,8 @@ _IO_file_sync_mmap (_IO_FILE *fp)
if (_IO_in_backup (fp))
delta -= eGptr () - Gbase ();
#endif
if (
# ifdef _G_LSEEK64
_G_LSEEK64
# else
__lseek
# endif
(fp->_fileno, fp->_IO_read_ptr - fp->_IO_buf_base, SEEK_SET)
if (__lseek64 (fp->_fileno, fp->_IO_read_ptr - fp->_IO_buf_base,
SEEK_SET)
!= fp->_IO_read_ptr - fp->_IO_buf_base)
{
fp->_flags |= _IO_ERR_SEEN;
@ -1236,11 +1211,7 @@ _IO_file_seek (fp, offset, dir)
_IO_off64_t offset;
int dir;
{
#ifdef _G_LSEEK64
return _G_LSEEK64 (fp->_fileno, offset, dir);
#else
return lseek (fp->_fileno, offset, dir);
#endif
return __lseek64 (fp->_fileno, offset, dir);
}
libc_hidden_def (_IO_file_seek)
@ -1249,11 +1220,7 @@ _IO_file_stat (fp, st)
_IO_FILE *fp;
void *st;
{
#ifdef _G_FSTAT64
return _G_FSTAT64 (fp->_fileno, (struct stat64 *) st);
#else
return fstat (fp->_fileno, (struct stat *) st);
#endif
return __fxstat64 (_STAT_VER, fp->_fileno, (struct stat64 *) st);
}
libc_hidden_def (_IO_file_stat)

5
libio/freopen64.c
View File

@ -40,7 +40,6 @@ freopen64 (filename, mode, fp)
const char* mode;
FILE *fp;
{
#ifdef _G_OPEN64
FILE *result;
CHECK_FILE (fp, NULL);
if (!(fp->_flags & _IO_IS_FILEBUF))
@ -101,8 +100,4 @@ freopen64 (filename, mode, fp)
free ((char *) gfilename);
_IO_release_lock (fp);
return result;
#else
__set_errno (ENOSYS);
return NULL;
#endif
}

5
libio/fseeko64.c
View File

@ -37,17 +37,12 @@ fseeko64 (fp, offset, whence)
__off64_t offset;
int whence;
{
#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, -1);
_IO_acquire_lock (fp);
result = _IO_fseek (fp, offset, whence);
_IO_release_lock (fp);
return result;
#else
__set_errno (ENOSYS);
return -1;
#endif
}
#endif

5
libio/ftello64.c
View File

@ -35,7 +35,6 @@ off64_t
ftello64 (fp)
_IO_FILE *fp;
{
#ifdef _G_LSEEK64
_IO_off64_t pos;
CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp);
@ -55,10 +54,6 @@ ftello64 (fp)
return -1L;
}
return pos;
#else
__set_errno (ENOSYS);
return -1;
#endif
}
#endif

5
libio/iofgetpos64.c
View File

@ -35,7 +35,6 @@ _IO_new_fgetpos64 (fp, posp)
_IO_FILE *fp;
_IO_fpos64_t *posp;
{
#ifdef _G_LSEEK64
_IO_off64_t pos;
int result = 0;
CHECK_FILE (fp, EOF);
@ -66,10 +65,6 @@ _IO_new_fgetpos64 (fp, posp)
}
_IO_release_lock (fp);
return result;
#else
__set_errno (ENOSYS);
return EOF;
#endif
}
strong_alias (_IO_new_fgetpos64, __new_fgetpos64)

5
libio/iofopen64.c
View File

@ -36,12 +36,7 @@ _IO_fopen64 (filename, mode)
const char *filename;
const char *mode;
{
#ifdef _G_OPEN64
return __fopen_internal (filename, mode, 0);
#else
__set_errno (ENOSYS);
return NULL;
#endif
}
#ifdef weak_alias

5
libio/iofsetpos64.c
View File

@ -35,7 +35,6 @@ _IO_new_fsetpos64 (fp, posp)
_IO_FILE *fp;
const _IO_fpos64_t *posp;
{
#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@ -60,10 +59,6 @@ _IO_new_fsetpos64 (fp, posp)
}
_IO_release_lock (fp);
return result;
#else
__set_errno (ENOSYS);
return EOF;
#endif
}
strong_alias (_IO_new_fsetpos64, __new_fsetpos64)

8
libio/oldiofgetpos64.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004
Free Software Foundation, Inc.
/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -37,7 +36,6 @@ _IO_old_fgetpos64 (fp, posp)
_IO_FILE *fp;
_IO_fpos64_t *posp;
{
#ifdef _G_LSEEK64
_IO_off64_t pos;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@ -57,10 +55,6 @@ _IO_old_fgetpos64 (fp, posp)
}
posp->__pos = pos;
return 0;
#else
__set_errno (ENOSYS);
return EOF;
#endif
}
#ifdef weak_alias

8
libio/oldiofsetpos64.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004
Free Software Foundation, Inc.
/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -37,7 +36,6 @@ _IO_old_fsetpos64 (fp, posp)
_IO_FILE *fp;
const _IO_fpos64_t *posp;
{
#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@ -56,10 +54,6 @@ _IO_old_fsetpos64 (fp, posp)
result = 0;
_IO_release_lock (fp);
return result;
#else
__set_errno (ENOSYS);
return EOF;
#endif
}
#ifdef weak_alias

5
sysdeps/generic/_G_config.h
View File

@ -49,11 +49,6 @@ typedef union
#define _G_IO_IO_FILE_VERSION 0x20001
#define _G_OPEN64 __open64
#define _G_LSEEK64 __lseek64
#define _G_MMAP64 __mmap64
#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
/* This is defined by <bits/stat.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)

5
sysdeps/unix/sysv/linux/_G_config.h
View File

@ -50,11 +50,6 @@ typedef union
#define _G_IO_IO_FILE_VERSION 0x20001
#define _G_OPEN64 __open64
#define _G_LSEEK64 __lseek64
#define _G_MMAP64 __mmap64
#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
/* This is defined by <bits/stat.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)