FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

public: Q_strstr should return pointer to non-const data

This commit is contained in:
Alibek Omarov 2022-06-29 03:56:42 +03:00
parent 5d4f8373c4
commit fb43a5590f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/crtlib.c
View File

@ -409,7 +409,7 @@ const char* Q_timestamp( int format )
} }
#if !defined( HAVE_STRCASESTR ) #if !defined( HAVE_STRCASESTR )
const char *Q_stristr( const char *string, const char *string2 ) char *Q_stristr( const char *string, const char *string2 )
{ {
int c; int c;
size_t len; size_t len;
@ -431,7 +431,7 @@ const char *Q_stristr( const char *string, const char *string2 )
} }
else return NULL; else return NULL;
} }
return string; return (char *)string;
} }
#endif // !defined( HAVE_STRCASESTR ) #endif // !defined( HAVE_STRCASESTR )

10
public/crtlib.h
View File

@ -105,9 +105,9 @@ static inline int Q_strncmp( const char *s1, const char *s2, size_t n )
( unlikely(!s2) ? 1 : strncmp( s1, s2, n )); ( unlikely(!s2) ? 1 : strncmp( s1, s2, n ));
} }
static inline const char *Q_strstr( const char *s1, const char *s2 ) static inline char *Q_strstr( const char *s1, const char *s2 )
{ {
return unlikely( !s1 || !s2 ) ? NULL : strstr( s1, s2 ); return unlikely( !s1 || !s2 ) ? NULL : (char*)strstr( s1, s2 );
} }
// libc extensions, be careful // libc extensions, be careful
@ -135,12 +135,12 @@ static inline int Q_strnicmp( const char *s1, const char *s2, size_t n )
#if XASH_WIN32 #if XASH_WIN32
#define strcasestr stristr #define strcasestr stristr
#endif #endif
static inline const char *Q_stristr( const char *s1, const char *s2 ) static inline char *Q_stristr( const char *s1, const char *s2 )
{ {
return unlikely( !s1 || !s2 ) ? NULL : strcasestr( s1, s2 ); return unlikely( !s1 || !s2 ) ? NULL : (char *)strcasestr( s1, s2 );
} }
#else // defined( HAVE_STRCASESTR ) #else // defined( HAVE_STRCASESTR )
const char *Q_stristr( const char *s1, const char *s2 ); char *Q_stristr( const char *s1, const char *s2 );
#endif // defined( HAVE_STRCASESTR ) #endif // defined( HAVE_STRCASESTR )