Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed some old and dead code.

Browse Source 
committer: mfx <mfx> 1126744217 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2005-09-15 00:30:17 +00:00
parent bfc835cbbf
commit 7aedc62058
9 changed files with 42 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.cpp
-225
View File
@@ -203,94 +203,6 @@ int find_le64(const void *b, int blen, acc_uint64l_t what)
}
/*************************************************************************
// find util
**************************************************************************/
#if (UPX_VERSION_HEX < 0x019000)
upx_bytep pfind(const void *b, int blen, const void *what, int wlen)
{
if (b == NULL || blen <= 0 || what == NULL || wlen <= 0)
return NULL;
int i;
const upx_bytep base = (const upx_bytep) b;
unsigned char firstc = * (const upx_bytep) what;
blen -= wlen;
for (i = 0; i <= blen; i++, base++)
if (*base == firstc && memcmp(base, what, wlen) == 0)
return const_cast<upx_bytep>(base);
return NULL;
}
upx_bytep pfind_be16(const void *b, int blen, unsigned what)
{
unsigned char w[2];
set_be16(w, what);
return pfind(b, blen, w, 2);
}
upx_bytep pfind_be32(const void *b, int blen, unsigned what)
{
unsigned char w[4];
set_be32(w, what);
return pfind(b, blen, w, 4);
}
upx_bytep pfind_le16(const void *b, int blen, unsigned what)
{
unsigned char w[2];
set_le16(w, what);
return pfind(b, blen, w, 2);
}
upx_bytep pfind_le32(const void *b, int blen, unsigned what)
{
unsigned char w[4];
set_le32(w, what);
return pfind(b, blen, w, 4);
}
#endif /* UPX_VERSION_HEX */
/*************************************************************************
// ctype util
**************************************************************************/
#if 0
bool upx_isdigit(int c)
{
return c >= '0' && c <= '9';
}
bool upx_islower(int c)
{
return c >= 'a' && c <= 'z';
}
bool upx_isspace(int c)
{
// according to "C" and "POSIX" locales
return strchr(" \f\n\r\t\v", c) != NULL;
}
int upx_tolower(int c)
{
if (c >= 'A' && c <= 'Z')
c += 'a' - 'A';
return c;
}
#endif
/*************************************************************************
// filename util
**************************************************************************/
@@ -594,39 +506,6 @@ unsigned get_ratio(unsigned u_len, unsigned c_len)
}
/*************************************************************************
// memory debugging
**************************************************************************/
#if defined(WITH_GC)
extern "C" {
#undef malloc
#undef realloc
#undef free
#ifndef __malloc_ptr_t
# define __malloc_ptr_t __ptr_t
#endif
__malloc_ptr_t malloc(size_t size)
{
return GC_MALLOC(size);
}
__malloc_ptr_t realloc(__malloc_ptr_t ptr, size_t size)
{
return GC_REALLOC(ptr, size);
}
void free(__malloc_ptr_t ptr)
{
GC_FREE(ptr);
}
}; // extern "C"
#endif
/*************************************************************************
// Don't link these functions from libc ==> save xxx bytes
**************************************************************************/
@@ -653,110 +532,6 @@ time_t time(time_t *t)
#endif /* __DJGPP__ */
// These space savings are only useful when building a statically
// linked version, so this is disabled for now.
#if 0 && defined(__linux__) && defined(__GLIBC__)
#if 1
// We don't need floating point support in printf().
// See glibc/stdio-common/*
int __printf_fp(void)
{
assert(0);
return -1;
}
int __printf_fphex(void)
{
assert(0);
return -1;
}
#endif
#if 1
// We don't need multibyte character support.
// See <wchar.h> and glibc/xxx/vfprintf.c
int mblen(const char *, size_t)
{
assert(0);
return -1;
}
int mbtowc(...)
{
assert(0);
return -1;
}
int mbrtowc(...)
{
assert(0);
return -1;
}
// glibc internals
size_t __ctype_get_mb_cur_max(void)
{
assert(0);
return 1;
}
int __mbrlen(...)
{
assert(0);
return -1;
}
int __mbrtowc(...)
{
assert(0);
return -1;
}
int __wcrtomb(...)
{
assert(0);
return -1;
}
int __wcsrtombs(...)
{
assert(0);
return -1;
}
// see strtol.c
int __btowc(...)
{
assert(0);
return -1;
}
#endif
#if 1
// We don't need *scanf.
// See iovsscanf.c
// (libc6 2.1.1-10: this function pulls in ~80kB code !)
int _IO_vsscanf(void)
{
assert(0);
return -1;
}
#endif
#if 0
// FIXME - also should get rid of this intl stuff
// see glibc/intl/*
static const char _nl_default_default_domain[] = "messages";
static const char *_nl_current_default_domain = _nl_default_default_domain;
static const char _nl_default_dirname[] = "";
char *bindtextdomain(const char *, const char *)
{
return NULL;
}
char *textdomain(const char *)
{
return (char *) _nl_current_default_domain;
}
#endif
#endif /* __linux__ && __GLIBC__ */
} // extern "C"