[BACK]Return to elf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / nm

Diff for /src/usr.bin/nm/elf.c between version 1.12 and 1.13

version 1.12, 2004/10/11 04:50:47 version 1.13, 2005/01/19 19:37:29
Line 55 
Line 55 
 #define swap_quarter    swap16  #define swap_quarter    swap16
 #define elf_fix_header  elf32_fix_header  #define elf_fix_header  elf32_fix_header
 #define elf_load_shdrs  elf32_load_shdrs  #define elf_load_shdrs  elf32_load_shdrs
   #define elf_load_phdrs  elf32_load_phdrs
 #define elf_fix_shdrs   elf32_fix_shdrs  #define elf_fix_shdrs   elf32_fix_shdrs
 #define elf_fix_phdrs   elf32_fix_phdrs  #define elf_fix_phdrs   elf32_fix_phdrs
 #define elf_fix_sym     elf32_fix_sym  #define elf_fix_sym     elf32_fix_sym
Line 78 
Line 79 
 #define swap_quarter    swap16  #define swap_quarter    swap16
 #define elf_fix_header  elf64_fix_header  #define elf_fix_header  elf64_fix_header
 #define elf_load_shdrs  elf64_load_shdrs  #define elf_load_shdrs  elf64_load_shdrs
   #define elf_load_phdrs  elf64_load_phdrs
 #define elf_fix_shdrs   elf64_fix_shdrs  #define elf_fix_shdrs   elf64_fix_shdrs
 #define elf_fix_phdrs   elf64_fix_phdrs  #define elf_fix_phdrs   elf64_fix_phdrs
 #define elf_fix_sym     elf64_fix_sym  #define elf_fix_sym     elf64_fix_sym
Line 163 
Line 165 
   
         elf_fix_shdrs(head, shdr);          elf_fix_shdrs(head, shdr);
         return (shdr);          return (shdr);
   }
   
   Elf_Phdr *
   elf_load_phdrs(const char *name, FILE *fp, off_t foff, Elf_Ehdr *head)
   {
           Elf_Phdr *phdr;
   
           if ((phdr = malloc(head->e_phentsize * head->e_phnum)) == NULL) {
                   warn("%s: malloc phdr", name);
                   return (NULL);
           }
   
           if (fseeko(fp, foff + head->e_phoff, SEEK_SET)) {
                   warn("%s: fseeko", name);
                   free(phdr);
                   return (NULL);
           }
   
           if (fread(phdr, head->e_phentsize, head->e_phnum, fp) != head->e_phnum) {
                   warnx("%s: premature EOF", name);
                   free(phdr);
                   return (NULL);
           }
   
           elf_fix_phdrs(head, phdr);
           return (phdr);
 }  }
   
 int  int

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13