summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-11-19 11:49:03 -0500
committermidipix <writeonce@midipix.org>2016-11-19 11:49:03 -0500
commit11fb1c69c1701d2bf6532443a7e9f57344308cdd (patch)
tree9a3f1746c5263f8ec05b98d0c7b236ca42e446eb
parent99c4526766e22ec051156c716a698402329f793e (diff)
downloadperk-11fb1c69c1701d2bf6532443a7e9f57344308cdd.tar.bz2
perk-11fb1c69c1701d2bf6532443a7e9f57344308cdd.tar.xz
PE format: struct pe_coff_file_hdr --> pe_raw_coff_file_hdr.
-rw-r--r--include/perk/perk.h4
-rw-r--r--include/perk/perk_structs.h2
-rw-r--r--src/logic/pe_get_image_meta.c2
-rw-r--r--src/reader/pe_read_coff_header.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/perk/perk.h b/include/perk/perk.h
index cd15c39..3d58adc 100644
--- a/include/perk/perk.h
+++ b/include/perk/perk.h
@@ -99,7 +99,7 @@ struct pe_image_meta {
struct pe_meta_sec_hdr * sectbl;
struct pe_raw_image_dos_hdr * ados;
- struct pe_coff_file_hdr * acoff;
+ struct pe_raw_coff_file_hdr * acoff;
union pe_opt_hdr * aopt;
struct pe_sec_hdr * asectbl;
@@ -197,7 +197,7 @@ perk_api int pe_get_image_framework (const struct pe_image_meta *, struct pe_in
/* low-level api */
perk_api int pe_read_dos_header (const struct pe_raw_image_dos_hdr *, struct pe_meta_image_dos_hdr *);
-perk_api int pe_read_coff_header (const struct pe_coff_file_hdr *, struct pe_meta_coff_file_hdr *);
+perk_api int pe_read_coff_header (const struct pe_raw_coff_file_hdr *, struct pe_meta_coff_file_hdr *);
perk_api int pe_read_optional_header (const union pe_opt_hdr *, struct pe_meta_opt_hdr *);
perk_api int pe_read_section_header (const struct pe_sec_hdr *, struct pe_meta_sec_hdr *);
perk_api int pe_read_export_header (const struct pe_export_hdr *, struct pe_meta_export_hdr *);
diff --git a/include/perk/perk_structs.h b/include/perk/perk_structs.h
index 5e40999..51689d3 100644
--- a/include/perk/perk_structs.h
+++ b/include/perk/perk_structs.h
@@ -28,7 +28,7 @@ struct pe_raw_image_dos_hdr {
};
-struct pe_coff_file_hdr {
+struct pe_raw_coff_file_hdr {
unsigned char signature [0x04]; /* 0x00 */
unsigned char machine [0x02]; /* 0x04 */
unsigned char num_of_sections [0x02]; /* 0x06 */
diff --git a/src/logic/pe_get_image_meta.c b/src/logic/pe_get_image_meta.c
index e735da5..e62d4e6 100644
--- a/src/logic/pe_get_image_meta.c
+++ b/src/logic/pe_get_image_meta.c
@@ -183,7 +183,7 @@ int pe_get_image_meta(
return pe_free_image_meta_impl(
m,PERK_CUSTOM_ERROR(dctx,ret));
- m->acoff = (struct pe_coff_file_hdr *)(base + m->dos.dos_lfanew);
+ m->acoff = (struct pe_raw_coff_file_hdr *)(base + m->dos.dos_lfanew);
if ((ret = (pe_read_coff_header(m->acoff,&m->coff))))
return pe_free_image_meta_impl(
diff --git a/src/reader/pe_read_coff_header.c b/src/reader/pe_read_coff_header.c
index b6e125f..1b4dfe3 100644
--- a/src/reader/pe_read_coff_header.c
+++ b/src/reader/pe_read_coff_header.c
@@ -10,7 +10,7 @@
#include "perk_endian_impl.h"
#include "perk_reader_impl.h"
-int pe_read_coff_header(const struct pe_coff_file_hdr * p, struct pe_meta_coff_file_hdr * m)
+int pe_read_coff_header(const struct pe_raw_coff_file_hdr * p, struct pe_meta_coff_file_hdr * m)
{
if ((p->signature[0] != 'P') || (p->signature[1] != 'E')
|| p->signature[2] || p->signature[3])