From b3411ff0c68d00c4ecf9761f8fdc14a2d1133c49 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 12 Dec 2000 02:28:13 +0000 Subject: [PATCH] Moved some string support functions from p_w32pe.cpp to util.h. committer: mfx 976588093 +0000 --- src/p_w32pe.cpp | 20 -------------------- src/util.h | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp index d6ba2a22..6d4e12f9 100644 --- a/src/p_w32pe.cpp +++ b/src/p_w32pe.cpp @@ -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 diff --git a/src/util.h b/src/util.h index cd35c8ff..63ecbe74 100644 --- a/src/util.h +++ b/src/util.h @@ -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); +} /*************************************************************************