diff options
Diffstat (limited to 'usr.sbin/kgzip/elfhdr.c')
| -rw-r--r-- | usr.sbin/kgzip/elfhdr.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c index 50bb0b7..12b1d5f 100644 --- a/usr.sbin/kgzip/elfhdr.c +++ b/usr.sbin/kgzip/elfhdr.c @@ -26,9 +26,9 @@ * $FreeBSD$ */ +#include <sys/endian.h> #include <stddef.h> #include "elfhdr.h" -#include "endian.h" #define KGZ_FIX_NSIZE 0 /* Run-time fixup */ @@ -43,80 +43,80 @@ const struct kgz_elfhdr elfhdr = { ELFCLASS32, ELFDATA2LSB, EV_CURRENT, 0, 'F', 'r', 'e', 'e', 'B', 'S', 'D', 0 }, - HTOLE16(ET_EXEC), /* e_type */ - HTOLE16(EM_386), /* e_machine */ - HTOLE32(EV_CURRENT), /* e_version */ + htole16(ET_EXEC), /* e_type */ + htole16(EM_386), /* e_machine */ + htole32(EV_CURRENT), /* e_version */ 0, /* e_entry */ 0, /* e_phoff */ - HTOLE32(offsetof(struct kgz_elfhdr, sh)), /* e_shoff */ + htole32(offsetof(struct kgz_elfhdr, sh)), /* e_shoff */ 0, /* e_flags */ - HTOLE16(sizeof(Elf32_Ehdr)), /* e_ehsize */ + htole16(sizeof(Elf32_Ehdr)), /* e_ehsize */ 0, /* e_phentsize */ 0, /* e_phnum */ - HTOLE16(sizeof(Elf32_Shdr)), /* e_shentsize */ - HTOLE16(KGZ_SHNUM), /* e_shnum */ - HTOLE16(KGZ_SH_SHSTRTAB) /* e_shstrndx */ + htole16(sizeof(Elf32_Shdr)), /* e_shentsize */ + htole16(KGZ_SHNUM), /* e_shnum */ + htole16(KGZ_SH_SHSTRTAB) /* e_shstrndx */ }, /* Section header */ { { 0, /* sh_name */ - HTOLE32(SHT_NULL), /* sh_type */ + htole32(SHT_NULL), /* sh_type */ 0, /* sh_flags */ 0, /* sh_addr */ 0, /* sh_offset */ 0, /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ 0, /* sh_addralign */ 0 /* sh_entsize */ }, { - HTOLE32(offsetof(struct kgz_shstrtab, symtab)), /* sh_name */ - HTOLE32(SHT_SYMTAB), /* sh_type */ + htole32(offsetof(struct kgz_shstrtab, symtab)), /* sh_name */ + htole32(SHT_SYMTAB), /* sh_type */ 0, /* sh_flags */ 0, /* sh_addr */ - HTOLE32(offsetof(struct kgz_elfhdr, st)), /* sh_offset */ - HTOLE32(sizeof(Elf32_Sym) * KGZ_STNUM), /* sh_size */ - HTOLE32(KGZ_SH_STRTAB), /* sh_link */ - HTOLE32(1), /* sh_info */ - HTOLE32(4), /* sh_addralign */ - HTOLE32(sizeof(Elf32_Sym)) /* sh_entsize */ + htole32(offsetof(struct kgz_elfhdr, st)), /* sh_offset */ + htole32(sizeof(Elf32_Sym) * KGZ_STNUM), /* sh_size */ + htole32(KGZ_SH_STRTAB), /* sh_link */ + htole32(1), /* sh_info */ + htole32(4), /* sh_addralign */ + htole32(sizeof(Elf32_Sym)) /* sh_entsize */ }, { - HTOLE32(offsetof(struct kgz_shstrtab, shstrtab)), /* sh_name */ - HTOLE32(SHT_STRTAB), /* sh_type */ + htole32(offsetof(struct kgz_shstrtab, shstrtab)), /* sh_name */ + htole32(SHT_STRTAB), /* sh_type */ 0, /* sh_flags */ 0, /* sh_addr */ - HTOLE32(offsetof(struct kgz_elfhdr, shstrtab)), /* sh_offset */ - HTOLE32(sizeof(struct kgz_shstrtab)), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(offsetof(struct kgz_elfhdr, shstrtab)), /* sh_offset */ + htole32(sizeof(struct kgz_shstrtab)), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(1), /* sh_addralign */ + htole32(1), /* sh_addralign */ 0 /* sh_entsize */ }, { - HTOLE32(offsetof(struct kgz_shstrtab, strtab)), /* sh_name */ - HTOLE32(SHT_STRTAB), /* sh_type */ + htole32(offsetof(struct kgz_shstrtab, strtab)), /* sh_name */ + htole32(SHT_STRTAB), /* sh_type */ 0, /* sh_flags */ 0, /* sh_addr */ - HTOLE32(offsetof(struct kgz_elfhdr, strtab)), /* sh_offset */ - HTOLE32(sizeof(struct kgz_strtab)), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(offsetof(struct kgz_elfhdr, strtab)), /* sh_offset */ + htole32(sizeof(struct kgz_strtab)), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(1), /* sh_addralign */ + htole32(1), /* sh_addralign */ 0 /* sh_entsize */ }, { - HTOLE32(offsetof(struct kgz_shstrtab, data)), /* sh_name */ - HTOLE32(SHT_PROGBITS), /* sh_type */ - HTOLE32(SHF_ALLOC | SHF_WRITE), /* sh_flags */ + htole32(offsetof(struct kgz_shstrtab, data)), /* sh_name */ + htole32(SHT_PROGBITS), /* sh_type */ + htole32(SHF_ALLOC | SHF_WRITE), /* sh_flags */ 0, /* sh_addr */ - HTOLE32(sizeof(struct kgz_elfhdr)), /* sh_offset */ - HTOLE32(sizeof(struct kgz_hdr) + KGZ_FIX_NSIZE), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(sizeof(struct kgz_elfhdr)), /* sh_offset */ + htole32(sizeof(struct kgz_hdr) + KGZ_FIX_NSIZE), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(4), /* sh_addralign */ + htole32(4), /* sh_addralign */ 0 /* sh_entsize */ } }, @@ -128,23 +128,23 @@ const struct kgz_elfhdr elfhdr = { 0, /* st_size */ 0, /* st_info */ 0, /* st_other */ - HTOLE16(SHN_UNDEF) /* st_shndx */ + htole16(SHN_UNDEF) /* st_shndx */ }, { - HTOLE32(offsetof(struct kgz_strtab, kgz)), /* st_name */ + htole32(offsetof(struct kgz_strtab, kgz)), /* st_name */ 0, /* st_value */ - HTOLE32(sizeof(struct kgz_hdr)), /* st_size */ + htole32(sizeof(struct kgz_hdr)), /* st_size */ ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT), /* st_info */ 0, /* st_other */ - HTOLE16(KGZ_SH_DATA) /* st_shndx */ + htole16(KGZ_SH_DATA) /* st_shndx */ }, { - HTOLE32(offsetof(struct kgz_strtab, kgz_ndata)), /* st_name */ - HTOLE32(sizeof(struct kgz_hdr)), /* st_value */ - HTOLE32(KGZ_FIX_NSIZE), /* st_size */ + htole32(offsetof(struct kgz_strtab, kgz_ndata)), /* st_name */ + htole32(sizeof(struct kgz_hdr)), /* st_value */ + htole32(KGZ_FIX_NSIZE), /* st_size */ ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT), /* st_info */ 0, /* st_other */ - HTOLE16(KGZ_SH_DATA) /* st_shndx */ + htole16(KGZ_SH_DATA) /* st_shndx */ } }, /* Section header string table */ |
