|
|
@ -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 )
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|