Cleanup of ELF structures and typo fixes

sdk/xtdk/xtimage.h

@@ -607,7 +607,7 @@ typedef struct _PECOFF_IMAGE_RESOURCE_DATA_ENTRY
 } PECOFF_IMAGE_RESOURCE_DATA_ENTRY, *PPECOFF_IMAGE_RESOURCE_DATA_ENTRY;
 
 /* ELF identities */
-typedef enum _ELF_IDENT
+typedef enum _ELF_IMAGE_IDENTITY
 {
     EI_MAG0 = 0,
     EI_MAG1 = 1,
@@ -618,10 +618,10 @@ typedef enum _ELF_IDENT
     EI_VERSION = 6,
     EI_OSABI = 7,
     EI_ABIVERSION = 8
-} ELF_IDENT;
+} ELF_IMAGE_IDENTITY, *PELF_IMAGE_IDENTITY;
 
 /* ELF Program header types */
-typedef enum _ELF_PT
+typedef enum _ELF_IMAGE_PROGRAM_HEADER_TYPE
 {
     PT_NULL = 0,
     PT_LOAD = 1,
@@ -631,15 +631,15 @@ typedef enum _ELF_PT
     PT_SHLIB = 5,
     PT_PHDR = 6,
     PT_TLS = 7
-} ELF_PT;
+} ELF_IMAGE_PROGRAM_HEADER_TYPE, *PELF_IMAGE_PROGRAM_HEADER_TYPE;
 
 /* ELF image representation structure */
 typedef struct _ELF_IMAGE_CONTEXT
 {
     union
     {
-        PELF32_HEADER Header32;
-        PELF64_HEADER Header64;
+        PELF_IMAGE_HEADER32 Header32;
+        PELF_IMAGE_HEADER64 Header64;
     };
     PVOID Data;
     PVOID EntryPoint;
@@ -652,7 +652,7 @@ typedef struct _ELF_IMAGE_CONTEXT
 } ELF_IMAGE_CONTEXT, *PELF_IMAGE_CONTEXT;
 
 /* 32-bit ELF image header structure */
-typedef struct _ELF32_HEADER
+typedef struct _ELF_IMAGE_HEADER32
 {
     /* NOTE: EI_NIDENT seems to always be defined as 16. */
     UCHAR e_ident[16];
@@ -669,10 +669,10 @@ typedef struct _ELF32_HEADER
     UINT16 e_shentsize;
     UINT16 e_shnum;
     UINT16 e_shstrndx;
-} ELF32_HEADER, *PELF32_HEADER;
+} ELF_IMAGE_HEADER32, *PELF_IMAGE_HEADER32;
 
 /* 64-bit ELF image header structure */
-typedef struct _ELF64_HEADER
+typedef struct _ELF_IMAGE_HEADER64
 {
     /* NOTE: EI_NIDENT seems to always be defined as 16. */
     UCHAR e_ident[16];
@@ -689,10 +689,10 @@ typedef struct _ELF64_HEADER
     UINT16 e_shentsize;
     UINT16 e_shnum;
     UINT16 e_shstrndx;
-} ELF64_HEADER, *PELF64_HEADER;
+} ELF_IMAGE_HEADER64, *PELF_IMAGE_HEADER64;
 
 /* 32-bit ELF program header structure */
-typedef struct _ELF32_PROGRAM_HEADER
+typedef struct _ELF_IMAGE_PROGRAM_HEADER32
 {
     UINT32 p_type;
     UINT32 p_offset;
@@ -702,10 +702,10 @@ typedef struct _ELF32_PROGRAM_HEADER
     UINT32 p_memsz;
     UINT32 p_flags;
     UINT32 p_align;
-} ELF32_PROGRAM_HEADER, *PELF32_PROGRAM_HEADER;
+} ELF_IMAGE_PROGRAM_HEADER32, *PELF_IMAGE_PROGRAM_HEADER32;
 
 /* 64-bit ELF program header structure */
-typedef struct _ELF64_PROGRAM_HEADER
+typedef struct _ELF_IMAGE_PROGRAM_HEADER64
 {
     UINT32 p_type;
     UINT32 p_flags;
@@ -715,6 +715,6 @@ typedef struct _ELF64_PROGRAM_HEADER
     ULONG p_filesz;
     ULONG p_memsz;
     ULONG p_align;
-} ELF64_PROGRAM_HEADER, *PELF64_PROGRAM_HEADER;
+} ELF_IMAGE_PROGRAM_HEADER64, *PELF_IMAGE_PROGRAM_HEADER64;
 
 #endif /* __XTDK_XTIMAGE_H */