[Lsb-messages] /var/www/bzr/lsb/4.1/misc-test r2271: Backport devel fixes for newer gcc (r2263).
Jeff Licquia
licquia at linuxfoundation.org
Tue Apr 16 20:45:01 UTC 2013
------------------------------------------------------------
revno: 2271
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: misc-test
timestamp: Tue 2013-04-16 16:45:01 -0400
message:
Backport devel fixes for newer gcc (r2263).
modified:
archk/check_archive.c
elfchk/dwarf.c
elfchk/note.c
elfchk/sections.c
-------------- next part --------------
=== modified file 'archk/check_archive.c'
--- a/archk/check_archive.c 2012-08-06 23:55:28 +0000
+++ b/archk/check_archive.c 2013-04-16 20:45:01 +0000
@@ -164,7 +164,7 @@
char tmp_string[TMP_STRING_SIZE+1];
ElfFile *elffile;
Elf_Shdr *hdr1;
- Elf_Ehdr *phdr;
+/* Elf_Ehdr *phdr;*/
/* Open ELF file for analysis */
if( (elffile = open_archive(filename, journal, isProgram)) == NULL ) {
@@ -180,8 +180,8 @@
symbols in it. */
for(i=0;i<elffile->numsh;i++) {
hdr1=&(elffile->saddr[i]);
+#if 0
phdr=(Elf_Ehdr *)elffile->addr;
-#if 0
printf("Section[%2.2d] %d %s\n", i, hdr1->sh_link,
ElfGetStringIndex(elffile, hdr1->sh_name,
phdr->e_shstrndx));
=== modified file 'elfchk/dwarf.c'
--- a/elfchk/dwarf.c 2006-07-28 00:19:28 +0000
+++ b/elfchk/dwarf.c 2013-04-16 20:45:01 +0000
@@ -97,7 +97,7 @@
{
int numused, used = 0;
int tmp;
- long tmpaddr;
+/* long tmpaddr;*/
int opcode;
unsigned char rawop;
/* XXXSTU - Need to check the values read in each record */
@@ -160,7 +160,7 @@
/* Operand 1 - address */
if (ptr_encoding) {
- tmpaddr = (long) read_FDE_encoded(ptr, ptr_encoding, &numused);
+/* tmpaddr = (long) read_FDE_encoded(ptr, ptr_encoding, &numused);*/
ptr += numused;
used += numused;
} else {
=== modified file 'elfchk/note.c'
--- a/elfchk/note.c 2003-02-12 08:11:27 +0000
+++ b/elfchk/note.c 2013-04-16 20:45:01 +0000
@@ -12,17 +12,17 @@
check_NOTE(ElfFile *file, unsigned char *notes, int length, struct tetj_handle *journal)
{
Elf_Nhdr *note;
-char *name,*desc;
+/*char *name,*desc;*/
int curlen=0;
note=(Elf_Nhdr *)notes;
while(curlen<length) {
//fprintf(stderr,"note %x length %x\n", note, length);
//fprintf(stderr,"n_namesz %d\t", note->n_namesz );
- name=(char *)(note+1);
+/* name=(char *)(note+1);*/
curlen+=sizeof(Elf_Nhdr);
//fprintf(stderr,"n_descsz %d\t", note->n_descsz );
- desc=(name+note->n_namesz);
+/* desc=(name+note->n_namesz);*/
curlen+=note->n_namesz;
/* Pad if needed */
switch(curlen%sizeof(Elf_Off)) {
=== modified file 'elfchk/sections.c'
--- a/elfchk/sections.c 2011-02-27 18:53:17 +0000
+++ b/elfchk/sections.c 2013-04-16 20:45:01 +0000
@@ -68,13 +68,13 @@
int
checkBITS(char *secname, ElfFile *file1, Elf_Shdr *hdr1)
{
-caddr_t bits1;
+/*caddr_t bits1;*/
#ifdef VERBOSE
fprintf(stderr, "%s SECTION\n", secname );
#endif /* VERBOSE */
-bits1=file1->addr+hdr1->sh_offset;
+/*bits1=file1->addr+hdr1->sh_offset;*/
/*
#define min(a,b) ((a) <= (b) ? (a) : (b))
@@ -137,7 +137,7 @@
checkSYMBOLS(char *secname, ElfFile *file1, Elf_Shdr *hdr1, struct tetj_handle *journal)
{
int i, numsyms;
-Elf_Sym *syms1;
+/*Elf_Sym *syms1;*/
#ifdef VERBOSE
fprintf(stderr, "%s SECTION\n", secname );
@@ -145,7 +145,7 @@
numsyms=hdr1->sh_size/hdr1->sh_entsize;
-syms1=(Elf_Sym *)((caddr_t)file1->addr+hdr1->sh_offset);
+/*syms1=(Elf_Sym *)((caddr_t)file1->addr+hdr1->sh_offset);*/
for(i=0;i<numsyms;i++)
{
@@ -192,7 +192,7 @@
checkREL(ElfFile *file1, Elf_Shdr *hdr1, struct tetj_handle *journal)
{
int i, numrels, pass=1;
-Elf_Rel *rel1;
+/*Elf_Rel *rel1;*/
#ifdef VERBOSE
fprintf(stderr, "REL SECTION\n" );
@@ -200,7 +200,7 @@
numrels=hdr1->sh_size/hdr1->sh_entsize;
-rel1=(Elf_Rel *)((caddr_t)file1->addr+hdr1->sh_offset);
+/*rel1=(Elf_Rel *)((caddr_t)file1->addr+hdr1->sh_offset);*/
#define comparerelfield( field ) \
if( rel1[i].field != rel2[i].field ) { \
@@ -225,7 +225,7 @@
checkRELA(ElfFile *file1, Elf_Shdr *hdr1, struct tetj_handle *journal)
{
int i, numrels, pass = 1;
-Elf_Rela *rel1;
+/*Elf_Rela *rel1;*/
#ifdef VERBOSE
fprintf(stderr, "RELA SECTION\n" );
@@ -233,7 +233,7 @@
numrels=hdr1->sh_size/hdr1->sh_entsize;
-rel1=(Elf_Rela *)((caddr_t)file1->addr+hdr1->sh_offset);
+/*rel1=(Elf_Rela *)((caddr_t)file1->addr+hdr1->sh_offset);*/
#define comparerelfield( field ) \
if( rel1[i].field != rel2[i].field ) { \
More information about the lsb-messages
mailing list