mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Moved some string support functions from p_w32pe.cpp to util.h.

Browse Source 
committer: mfx <mfx> 976588093 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2000-12-12 02:28:13 +00:00
parent 546f561bd3
commit b3411ff0c6
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/p_w32pe.cpp
View File

@ -172,26 +172,6 @@ bool PackW32Pe::readFileHeader()
return true;
}
// FIXME: put these into util.h
// s/upx_byte/char/g would possibly be better
static inline char* strcpy(unsigned char *s1,const unsigned char *s2)
{
return strcpy((char*) s1,(const char*) s2);
}
static inline int strcasecmp(const unsigned char *s1,const unsigned char *s2)
{
return strcasecmp((const char*) s1,(const char*) s2);
}
static inline unsigned strlen(const unsigned char *s)
{
return strlen((const char*) s);
}
static inline int ptr_diff(const void *p1,const void *p2)
{
return (const char*) p1 - (const char*) p2;
}
/*************************************************************************
// interval handling

36
src/util.h
View File

@ -53,11 +53,37 @@ unsigned get_ratio(unsigned long packedsize, unsigned long size,
char *center_string(const char *name, size_t s);
upx_bytep find(const void * b, int blen, const void * what, int wlen);
upx_bytep find_be16(const void * b, int blen, unsigned what);
upx_bytep find_be32(const void * b, int blen, unsigned what);
upx_bytep find_le16(const void * b, int blen, unsigned what);
upx_bytep find_le32(const void * b, int blen, unsigned what);
unsigned char *find(const void *b, int blen, const void *what, int wlen);
unsigned char *find_be16(const void *b, int blen, unsigned what);
unsigned char *find_be32(const void *b, int blen, unsigned what);
unsigned char *find_le16(const void *b, int blen, unsigned what);
unsigned char *find_le32(const void *b, int blen, unsigned what);
inline ptrdiff_t ptr_diff(const void *p1, const void *p2)
{
return (const char*) p1 - (const char*) p2;
}
/*************************************************************************
// some unsigned char string support functions
**************************************************************************/
inline char *strcpy(unsigned char *s1,const unsigned char *s2)
{
return strcpy((char*) s1,(const char*) s2);
}
inline int strcasecmp(const unsigned char *s1,const unsigned char *s2)
{
return strcasecmp((const char*) s1,(const char*) s2);
}
inline size_t strlen(const unsigned char *s)
{
return strlen((const char*) s);
}
/*************************************************************************