Rewritten to avoid cast that drops const qualification.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14647
This commit is contained in:
Florian Krohm 2014-10-21 17:15:14 +00:00
parent 17fe8c0a09
commit 361909e022
2 changed files with 5 additions and 7 deletions

View File

@ -136,7 +136,7 @@
#define DO_PthAPIerror(_fnnameF, _errF) \
do { \
char* _fnname = (char*)(_fnnameF); \
const char* _fnname = (_fnnameF); \
long _err = (long)(int)(_errF); \
const char* _errstr = lame_strerror(_err); \
DO_CREQ_v_WWW(_VG_USERREQ__HG_PTH_API_ERROR, \

View File

@ -1327,8 +1327,6 @@ static inline void my_exit ( int x )
void* VG_REPLACE_FUNCTION_EZU(20290,soname,fnname) \
( void *dst, const void *src, SizeT len ) \
{ \
register HChar *d; \
register HChar *s; \
SizeT len_saved = len; \
\
if (len == 0) \
@ -1338,14 +1336,14 @@ static inline void my_exit ( int x )
RECORD_OVERLAP_ERROR("mempcpy", dst, src, len); \
\
if ( dst > src ) { \
d = (char *)dst + len - 1; \
s = (char *)src + len - 1; \
register HChar *d = (char *)dst + len - 1; \
register const HChar *s = (const char *)src + len - 1; \
while ( len-- ) { \
*d-- = *s--; \
} \
} else if ( dst < src ) { \
d = (char *)dst; \
s = (char *)src; \
register HChar *d = dst; \
register const HChar *s = src; \
while ( len-- ) { \
*d++ = *s++; \
} \