Revert previous checkin.

committer: mfx <mfx> 1139914479 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2006-02-14 10:54:39 +00:00
parent 452ac52fcb
commit 69eaaa4177
3 changed files with 6 additions and 9 deletions

View File

@ -128,6 +128,8 @@ static int hex(char c)
int Linker::addSection(const char *psect)
{
if (psect[0] == 0)
return olen;
char *begin = strdup(psect);
char *end = begin + strlen(begin);
for (char *sect = begin; sect < end; )

View File

@ -1072,21 +1072,17 @@ void Packer::initLoader(const void *pdata, int plen, int pinfo, int small)
}
void Packer::addLoader(const char *s)
{
if (*s)
linker->addSection(s);
}
void __acc_cdecl_va Packer::addLoader(const char *s, ...)
{
va_list ap;
va_start(ap, s);
do {
while (s != NULL)
{
if (*s)
linker->addSection(s);
} while ((s = va_arg(ap, const char *)) != NULL);
s = va_arg(ap, const char *);
}
va_end(ap);
}

View File

@ -208,7 +208,6 @@ protected:
virtual const upx_byte *getLoader() const;
virtual int getLoaderSize() const;
virtual void initLoader(const void *pdata, int plen, int pinfo=-1, int small=-1);
virtual void addLoader(const char *s);
virtual void __acc_cdecl_va addLoader(const char *s, ...);
virtual int getLoaderSection(const char *name, int *slen=NULL) const;
virtual int getLoaderSectionStart(const char *name, int *slen=NULL) const;