← Back to branch summary

~noskcaj/ubuntu/trusty/libextractor/merge

« back to all changes in this revision

Viewing changes to src/plugins/elfextractor.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-11-17 20:27:32 UTC
  • mfrom: (1.10.4 upstream) (5.2.5 sid)
  • Revision ID: james.westby@ubuntu.com-20091117202732-ipm2h3gks5bdw2vx
Tags: 0.5.23+dfsg-3
* Building against libltdl7.
* Updating to standards version 3.8.3.
* Adding maintainer homepage field to control.
* Marking maintainer homepage field to be also included in binary
  packages and changelog.
* Adding README.source.
* Simplifying autotools handling in rules.
* Updating README.source.
* Moving maintainer homepage field from control to copyright.
* Dropping la files.
* Simplyfing debhelper install files.
* Bumping versioned build-depends on debhelper.
* Adding depends to dpkg install info.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/elfextractor.c
294
294
  if (ehdr->e_shnum <= idx)
295
295
    return -1;
296
296
 
297
 
  cat_unpack (&data[ehdr->e_shoff + ehdr->e_shentsize * idx],
 
297
  EXTRACTOR_common_cat_unpack (&data[ehdr->e_shoff + ehdr->e_shentsize * idx],
298
298
              ELF_SECTION_SPECS[getByteorder (data[EI_CLASS])],
299
299
              ELF_SECTION_FIELDS (ret));
300
300
  return 0;
312
312
{
313
313
  if ((off + osize > size) || ((idx + 1) * ELF_DYN_SIZE > osize))
314
314
    return -1;
315
 
  cat_unpack (&data[off + idx * ELF_DYN_SIZE],
 
315
  EXTRACTOR_common_cat_unpack (&data[off + idx * ELF_DYN_SIZE],
316
316
              ELF_DYN_SPECS[getByteorder (data[EI_CLASS])],
317
317
              ELF_DYN_FIELDS (ret));
318
318
  return 0;
330
330
  if (ehdr->e_phnum <= idx)
331
331
    return -1;
332
332
 
333
 
  cat_unpack (&data[ehdr->e_phoff + ehdr->e_phensize * idx],
 
333
  EXTRACTOR_common_cat_unpack (&data[ehdr->e_phoff + ehdr->e_phensize * idx],
334
334
              ELF_PHDR_SPECS[getByteorder (data[EI_CLASS])],
335
335
              ELF_PHDR_FIELDS (ret));
336
336
  return 0;
353
353
    {
354
354
    case ELFDATA2LSB:
355
355
    case ELFDATA2MSB:
356
 
      cat_unpack (&data[EI_NIDENT],
 
356
      EXTRACTOR_common_cat_unpack (&data[EI_NIDENT],
357
357
                  ELF_HEADER_SPECS[getByteorder (data[EI_CLASS])],
358
358
                  ELF_HEADER_FIELDS (ehdr));
359
359
      break;