From df4726eb950d1311d2a940c474e79e3d8304bf4d Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 3 Jan 2001 16:28:47 +0000 Subject: [PATCH] Removed Packer::addSection(). committer: mfx 978539327 +0000 --- src/packer.cpp | 14 +++++--------- src/packer.h | 3 +-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/packer.cpp b/src/packer.cpp index 983b2ea3..0f2adff2 100644 --- a/src/packer.cpp +++ b/src/packer.cpp @@ -941,9 +941,9 @@ void Packer::initLoader(const void *pdata, int plen, int pinfo) "\n"; if (opt->small) - addSection("IDENTSTR",identsmall,sizeof(identsmall)); + linker->addSection("IDENTSTR",identsmall,sizeof(identsmall)); else - addSection("IDENTSTR",identbig,sizeof(identbig)); + linker->addSection("IDENTSTR",identbig,sizeof(identbig)); } @@ -960,12 +960,6 @@ void Packer::addLoader(const char *s, ...) } -void Packer::addSection(const char *sname, const char *sdata, unsigned len) -{ - linker->addSection(sname, sdata, len); -} - - int Packer::getLoaderSection(const char *name, int *slen) const { int size = -1; @@ -979,12 +973,14 @@ int Packer::getLoaderSection(const char *name, int *slen) const // same, but the size of the section may be == 0 -int Packer::getLoaderSectionStart(const char *name) const +int Packer::getLoaderSectionStart(const char *name, int *slen) const { int size = -1; int ostart = linker->getSection(name, &size); if (ostart < 0 || size < 0) throwBadLoader(); + if (slen) + *slen = size; return ostart; } diff --git a/src/packer.h b/src/packer.h index 2d06a80d..48d1f30e 100644 --- a/src/packer.h +++ b/src/packer.h @@ -207,9 +207,8 @@ protected: virtual int getLoaderSize() const; virtual void initLoader(const void *pdata, int plen, int pinfo=-1); virtual void addLoader(const char *s, ...); - virtual void addSection(const char *sname, const char *sdata, unsigned len); virtual int getLoaderSection(const char *name, int *slen=NULL) const; - virtual int getLoaderSectionStart(const char *name) const; + virtual int getLoaderSectionStart(const char *name, int *slen=NULL) const; virtual void addFilter32(int filter_id); virtual const char *getDecompressor() const;