diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /ext/fileinfo/libmagic/elfclass.h | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'ext/fileinfo/libmagic/elfclass.h')
| -rw-r--r-- | ext/fileinfo/libmagic/elfclass.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/fileinfo/libmagic/elfclass.h b/ext/fileinfo/libmagic/elfclass.h index 27817d0fef..7f6d8adce6 100644 --- a/ext/fileinfo/libmagic/elfclass.h +++ b/ext/fileinfo/libmagic/elfclass.h @@ -35,7 +35,7 @@ switch (type) { #ifdef ELFCORE case ET_CORE: - if (dophn_core(ms, clazz, swap, fd, + if (dophn_core(ms, class, swap, fd, (off_t)elf_getu(swap, elfhdr.e_phoff), elf_getu16(swap, elfhdr.e_phnum), (size_t)elf_getu16(swap, elfhdr.e_phentsize), @@ -45,21 +45,19 @@ #endif case ET_EXEC: case ET_DYN: - if (dophn_exec(ms, clazz, swap, fd, + if (dophn_exec(ms, class, swap, fd, (off_t)elf_getu(swap, elfhdr.e_phoff), elf_getu16(swap, elfhdr.e_phnum), (size_t)elf_getu16(swap, elfhdr.e_phentsize), - fsize, &flags, elf_getu16(swap, elfhdr.e_shnum)) - == -1) + fsize, &flags) == -1) return -1; /*FALLTHROUGH*/ case ET_REL: - if (doshn(ms, clazz, swap, fd, + if (doshn(ms, class, swap, fd, (off_t)elf_getu(swap, elfhdr.e_shoff), elf_getu16(swap, elfhdr.e_shnum), (size_t)elf_getu16(swap, elfhdr.e_shentsize), - &flags, - elf_getu16(swap, elfhdr.e_machine)) == -1) + &flags) == -1) return -1; break; |