Skip to content

Commit a739147

Browse files
philipcphilipc
authored
readobj/elf: delete duplicated field (#683)
Also fix a typo.
1 parent 0643b61 commit a739147

14 files changed

+1
-24
lines changed

‎crates/examples/src/readobj/elf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ fn print_file_header<Elf: FileHeader>(p: &mut Printer<'_>, endian: Elf::Endian,
4343
} else {
4444
p.field_hex("Version", version);
4545
}
46-
p.field_enum("Type", elf.e_type(endian), FLAGS_ET);
4746
p.field_hex("Entry", elf.e_entry(endian).into());
4847
p.field_hex("ProgramHeaderOffset", elf.e_phoff(endian).into());
4948
p.field_hex("SectionHeaderOffset", elf.e_shoff(endian).into());

‎crates/examples/testfiles/archive/bsd.a.readobj

-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ FileHeader {
1515
Type: ET_REL (0x1)
1616
Machine: EM_X86_64 (0x3E)
1717
Version: EV_CURRENT (0x1)
18-
Type: ET_REL (0x1)
1918
Entry: 0x0
2019
ProgramHeaderOffset: 0x0
2120
SectionHeaderOffset: 0x228
@@ -281,7 +280,6 @@ FileHeader {
281280
Type: ET_REL (0x1)
282281
Machine: EM_X86_64 (0x3E)
283282
Version: EV_CURRENT (0x1)
284-
Type: ET_REL (0x1)
285283
Entry: 0x0
286284
ProgramHeaderOffset: 0x0
287285
SectionHeaderOffset: 0x228
@@ -547,7 +545,6 @@ FileHeader {
547545
Type: ET_REL (0x1)
548546
Machine: EM_X86_64 (0x3E)
549547
Version: EV_CURRENT (0x1)
550-
Type: ET_REL (0x1)
551548
Entry: 0x0
552549
ProgramHeaderOffset: 0x0
553550
SectionHeaderOffset: 0x230
@@ -813,7 +810,6 @@ FileHeader {
813810
Type: ET_REL (0x1)
814811
Machine: EM_X86_64 (0x3E)
815812
Version: EV_CURRENT (0x1)
816-
Type: ET_REL (0x1)
817813
Entry: 0x0
818814
ProgramHeaderOffset: 0x0
819815
SectionHeaderOffset: 0x228
@@ -1079,7 +1075,6 @@ FileHeader {
10791075
Type: ET_REL (0x1)
10801076
Machine: EM_X86_64 (0x3E)
10811077
Version: EV_CURRENT (0x1)
1082-
Type: ET_REL (0x1)
10831078
Entry: 0x0
10841079
ProgramHeaderOffset: 0x0
10851080
SectionHeaderOffset: 0x228
@@ -1345,7 +1340,6 @@ FileHeader {
13451340
Type: ET_REL (0x1)
13461341
Machine: EM_X86_64 (0x3E)
13471342
Version: EV_CURRENT (0x1)
1348-
Type: ET_REL (0x1)
13491343
Entry: 0x0
13501344
ProgramHeaderOffset: 0x0
13511345
SectionHeaderOffset: 0x228

‎crates/examples/testfiles/archive/gnu.a.readobj

-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ FileHeader {
1515
Type: ET_REL (0x1)
1616
Machine: EM_X86_64 (0x3E)
1717
Version: EV_CURRENT (0x1)
18-
Type: ET_REL (0x1)
1918
Entry: 0x0
2019
ProgramHeaderOffset: 0x0
2120
SectionHeaderOffset: 0x228
@@ -281,7 +280,6 @@ FileHeader {
281280
Type: ET_REL (0x1)
282281
Machine: EM_X86_64 (0x3E)
283282
Version: EV_CURRENT (0x1)
284-
Type: ET_REL (0x1)
285283
Entry: 0x0
286284
ProgramHeaderOffset: 0x0
287285
SectionHeaderOffset: 0x228
@@ -547,7 +545,6 @@ FileHeader {
547545
Type: ET_REL (0x1)
548546
Machine: EM_X86_64 (0x3E)
549547
Version: EV_CURRENT (0x1)
550-
Type: ET_REL (0x1)
551548
Entry: 0x0
552549
ProgramHeaderOffset: 0x0
553550
SectionHeaderOffset: 0x230
@@ -813,7 +810,6 @@ FileHeader {
813810
Type: ET_REL (0x1)
814811
Machine: EM_X86_64 (0x3E)
815812
Version: EV_CURRENT (0x1)
816-
Type: ET_REL (0x1)
817813
Entry: 0x0
818814
ProgramHeaderOffset: 0x0
819815
SectionHeaderOffset: 0x228
@@ -1079,7 +1075,6 @@ FileHeader {
10791075
Type: ET_REL (0x1)
10801076
Machine: EM_X86_64 (0x3E)
10811077
Version: EV_CURRENT (0x1)
1082-
Type: ET_REL (0x1)
10831078
Entry: 0x0
10841079
ProgramHeaderOffset: 0x0
10851080
SectionHeaderOffset: 0x228
@@ -1345,7 +1340,6 @@ FileHeader {
13451340
Type: ET_REL (0x1)
13461341
Machine: EM_X86_64 (0x3E)
13471342
Version: EV_CURRENT (0x1)
1348-
Type: ET_REL (0x1)
13491343
Entry: 0x0
13501344
ProgramHeaderOffset: 0x0
13511345
SectionHeaderOffset: 0x228

‎crates/examples/testfiles/elf/base-aarch64.o.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_REL (0x1)
1313
Machine: EM_AARCH64 (0xB7)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_REL (0x1)
1615
Entry: 0x0
1716
ProgramHeaderOffset: 0x0
1817
SectionHeaderOffset: 0x280

‎crates/examples/testfiles/elf/base-aarch64.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_DYN (0x3)
1313
Machine: EM_AARCH64 (0xB7)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_DYN (0x3)
1615
Entry: 0x620
1716
ProgramHeaderOffset: 0x40
1817
SectionHeaderOffset: 0x1CB8

‎crates/examples/testfiles/elf/base-mips64el.o.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_REL (0x1)
1313
Machine: EM_MIPS (0x8)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_REL (0x1)
1615
Entry: 0x0
1716
ProgramHeaderOffset: 0x0
1817
SectionHeaderOffset: 0x3E8

‎crates/examples/testfiles/elf/base-mips64el.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_EXEC (0x2)
1313
Machine: EM_MIPS (0x8)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_EXEC (0x2)
1615
Entry: 0x120000900
1716
ProgramHeaderOffset: 0x40
1817
SectionHeaderOffset: 0x1C50

‎crates/examples/testfiles/elf/base-strip.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_DYN (0x3)
1313
Machine: EM_X86_64 (0x3E)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_DYN (0x3)
1615
Entry: 0x570
1716
ProgramHeaderOffset: 0x40
1817
SectionHeaderOffset: 0x0

‎crates/examples/testfiles/elf/base.o.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_REL (0x1)
1313
Machine: EM_X86_64 (0x3E)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_REL (0x1)
1615
Entry: 0x0
1716
ProgramHeaderOffset: 0x0
1817
SectionHeaderOffset: 0x2D0

‎crates/examples/testfiles/elf/base.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_DYN (0x3)
1313
Machine: EM_X86_64 (0x3E)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_DYN (0x3)
1615
Entry: 0x570
1716
ProgramHeaderOffset: 0x40
1817
SectionHeaderOffset: 0x1948

‎crates/examples/testfiles/elf/nostd-mipsel.o.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_REL (0x1)
1313
Machine: EM_MIPS (0x8)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_REL (0x1)
1615
Entry: 0x0
1716
ProgramHeaderOffset: 0x0
1817
SectionHeaderOffset: 0x1A0

‎crates/examples/testfiles/elf/nostd-mipsel.readobj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_EXEC (0x2)
1313
Machine: EM_MIPS (0x8)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_EXEC (0x2)
1615
Entry: 0x0
1716
ProgramHeaderOffset: 0x34
1817
SectionHeaderOffset: 0x123C

‎crates/rewrite/testfiles/elf/base.noop

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FileHeader {
1212
Type: ET_DYN (0x3)
1313
Machine: EM_X86_64 (0x3E)
1414
Version: EV_CURRENT (0x1)
15-
Type: ET_DYN (0x3)
1615
Entry: 0x570
1716
ProgramHeaderOffset: 0x40
1817
SectionHeaderOffset: 0x1948

‎src/read/elf/section.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl<'data, Elf: FileHeader, R: ReadRef<'data>> SectionTable<'data, Elf, R> {
5959
/// Returns an error for the null section at index 0.
6060
pub fn section(&self, index: SectionIndex) -> read::Result<&'data Elf::SectionHeader> {
6161
if index.0 == 0 {
62-
return Err(read::Error("Invalid ELF symbol index"));
62+
return Err(read::Error("Invalid ELF section index"));
6363
}
6464
self.sections
6565
.get(index.0)

0 commit comments

Comments
 (0)