lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove undefined operations

Browse Source
This commit is contained in:
Andreas Schwab
2010-07-18 14:51:45 +02:00
parent 29fddf61b2
commit 817328eea7
7 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2010-09-05 Andreas Schwab <schwab@linux-m68k.org>
* debug/vdprintf_chk.c (__vdprintf_chk): Remove undefined
operation.
* libio/iofdopen.c (_IO_new_fdopen): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
Likewise.
2010-09-04 Ulrich Drepper <drepper@redhat.com> 2010-09-04 Ulrich Drepper <drepper@redhat.com>
[BZ #11979] [BZ #11979]

10
debug/vdprintf_chk.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008 /* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008, 2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -50,10 +50,10 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg)
INTUSE(_IO_un_link) (&tmpfil); INTUSE(_IO_un_link) (&tmpfil);
return EOF; return EOF;
} }
tmpfil.file._IO_file_flags = tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
(_IO_mask_flags (&tmpfil.file, _IO_NO_READS,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING) _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
| _IO_DELETE_DONT_CLOSE); _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
/* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n /* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n
can only come from read-only format strings. */ can only come from read-only format strings. */

7
libio/iofdopen.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003 /* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -172,9 +172,8 @@ _IO_new_fdopen (fd, mode)
} }
new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE; new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
new_f->fp.file._IO_file_flags = _IO_mask_flags (&new_f->fp.file, read_write,
_IO_mask_flags (&new_f->fp.file, read_write, _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return &new_f->fp.file; return &new_f->fp.file;
} }

7
libio/iofopncook.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005 /* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005, 2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -154,9 +154,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
INTUSE(_IO_file_init) (&cfile->__fp); INTUSE(_IO_file_init) (&cfile->__fp);
cfile->__fp.file._IO_file_flags = _IO_mask_flags (&cfile->__fp.file, read_write,
_IO_mask_flags (&cfile->__fp.file, read_write, _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
/* We use a negative number different from -1 for _fileno to mark that /* We use a negative number different from -1 for _fileno to mark that
this special stream is not associated with a real file, but still has this special stream is not associated with a real file, but still has

8
libio/iovdprintf.c
View File

@ -53,10 +53,10 @@ _IO_vdprintf (d, format, arg)
INTUSE(_IO_un_link) (&tmpfil); INTUSE(_IO_un_link) (&tmpfil);
return EOF; return EOF;
} }
tmpfil.file._IO_file_flags = tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
(_IO_mask_flags (&tmpfil.file, _IO_NO_READS,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING) _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
| _IO_DELETE_DONT_CLOSE); _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg); done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);

5
libio/oldiofdopen.c
View File

@ -130,9 +130,8 @@ _IO_old_fdopen (fd, mode)
} }
new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE; new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE;
new_f->fp.file._file._IO_file_flags = _IO_mask_flags (&new_f->fp.file._file, read_write,
_IO_mask_flags (&new_f->fp.file._file, read_write, _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return (_IO_FILE *) &new_f->fp; return (_IO_FILE *) &new_f->fp;
} }

8
sysdeps/powerpc/powerpc64/dl-machine.h
View File

@ -1,6 +1,6 @@
/* Machine-dependent ELF dynamic relocation inline functions. /* Machine-dependent ELF dynamic relocation inline functions.
PowerPC64 version. PowerPC64 version.
Copyright 1995-2005, 2006, 2008 Free Software Foundation, Inc. Copyright 1995-2005, 2006, 2008, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -641,16 +641,14 @@ elf_machine_rela (struct link_map *map,
value = elf_machine_tprel (map, sym_map, sym, reloc); value = elf_machine_tprel (map, sym_map, sym, reloc);
if (dont_expect ((value & 3) != 0)) if (dont_expect ((value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_TPREL16_LO_DS", reloc_addr, refsym); _dl_reloc_overflow (map, "R_PPC64_TPREL16_LO_DS", reloc_addr, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr, BIT_INSERT (*(Elf64_Half *) reloc_addr, value, 0xfffc);
value, 0xfffc);
break; break;
case R_PPC64_TPREL16_DS: case R_PPC64_TPREL16_DS:
value = elf_machine_tprel (map, sym_map, sym, reloc); value = elf_machine_tprel (map, sym_map, sym, reloc);
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0)) if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))
_dl_reloc_overflow (map, "R_PPC64_TPREL16_DS", reloc_addr, refsym); _dl_reloc_overflow (map, "R_PPC64_TPREL16_DS", reloc_addr, refsym);
*(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr, BIT_INSERT (*(Elf64_Half *) reloc_addr, value, 0xfffc);
value, 0xfffc);
break; break;
case R_PPC64_TPREL16: case R_PPC64_TPREL16: