From fad23f9ed823120339761ffd251f2b1b2c3b2e45 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 19 Nov 2016 14:49:53 -0500 Subject: PE format: union pe_opt_hdr [and friends] --> union pe_raw_opt_hdr. --- src/headers/pe_get_image_data_dirs_addr.c | 2 +- src/headers/pe_get_image_entry_point_addr.c | 2 +- src/headers/pe_get_image_opt_hdr_addr.c | 4 ++-- src/headers/pe_get_image_section_tbl_addr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/headers') diff --git a/src/headers/pe_get_image_data_dirs_addr.c b/src/headers/pe_get_image_data_dirs_addr.c index d0167c0..1edbdd3 100644 --- a/src/headers/pe_get_image_data_dirs_addr.c +++ b/src/headers/pe_get_image_data_dirs_addr.c @@ -13,7 +13,7 @@ pe_api struct pe_data_dirs * pe_get_image_data_dirs_addr(const void * base) { uint16_t * magic; - union pe_opt_hdr * hdr; + union pe_raw_opt_hdr * hdr; if (!(hdr = pe_get_image_opt_hdr_addr(base))) return 0; diff --git a/src/headers/pe_get_image_entry_point_addr.c b/src/headers/pe_get_image_entry_point_addr.c index 5869633..6f7bc90 100644 --- a/src/headers/pe_get_image_entry_point_addr.c +++ b/src/headers/pe_get_image_entry_point_addr.c @@ -14,7 +14,7 @@ pe_api void * pe_get_image_entry_point_addr(const void * base) { uint16_t * magic; - union pe_opt_hdr * hdr; + union pe_raw_opt_hdr * hdr; uint32_t * rva; if (!(hdr = pe_get_image_opt_hdr_addr(base))) diff --git a/src/headers/pe_get_image_opt_hdr_addr.c b/src/headers/pe_get_image_opt_hdr_addr.c index df3ec63..d784aed 100644 --- a/src/headers/pe_get_image_opt_hdr_addr.c +++ b/src/headers/pe_get_image_opt_hdr_addr.c @@ -9,12 +9,12 @@ #include pe_api -union pe_opt_hdr * pe_get_image_opt_hdr_addr(const void * base) +union pe_raw_opt_hdr * pe_get_image_opt_hdr_addr(const void * base) { struct pe_raw_coff_file_hdr * coff; if (!(coff = pe_get_image_coff_hdr_addr(base))) return 0; else - return (union pe_opt_hdr *)pe_va_from_rva(coff, sizeof(*coff)); + return (union pe_raw_opt_hdr *)pe_va_from_rva(coff, sizeof(*coff)); } diff --git a/src/headers/pe_get_image_section_tbl_addr.c b/src/headers/pe_get_image_section_tbl_addr.c index 52e24d0..bbab5a2 100644 --- a/src/headers/pe_get_image_section_tbl_addr.c +++ b/src/headers/pe_get_image_section_tbl_addr.c @@ -14,7 +14,7 @@ pe_api struct pe_sec_hdr * pe_get_image_section_tbl_addr (const void * base) { struct pe_raw_coff_file_hdr * coff; - union pe_opt_hdr * opt; + union pe_raw_opt_hdr * opt; if (!(coff = pe_get_image_coff_hdr_addr(base))) return 0; -- cgit v1.2.3