diff options
Diffstat (limited to 'drivers/staging/csr/csr_util.h')
-rw-r--r-- | drivers/staging/csr/csr_util.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index f19f953b3fe2..0d0112780da2 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -30,7 +30,7 @@ CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue); CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue); CsrBool CsrHexStrToUint32(const CsrCharString *string, u32 *returnValue); u32 CsrPow(u32 base, u32 exponent); -void CsrIntToBase10(CsrInt32 number, CsrCharString *str); +void CsrIntToBase10(s32 number, CsrCharString *str); void CsrUInt16ToHex(u16 number, CsrCharString *str); void CsrUInt32ToHex(u32 number, CsrCharString *str); @@ -44,9 +44,9 @@ void CsrUInt32ToHex(u32 number, CsrCharString *str); #define CsrStrNCpy strncpy #define CsrStrCat strcat #define CsrStrNCat strncat -#define CsrMemCmp(s1, s2, n) ((CsrInt32) memcmp((s1), (s2), (n))) -#define CsrStrCmp(s1, s2) ((CsrInt32) strcmp((s1), (s2))) -#define CsrStrNCmp(s1, s2, n) ((CsrInt32) strncmp((s1), (s2), (n))) +#define CsrMemCmp(s1, s2, n) ((s32) memcmp((s1), (s2), (n))) +#define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2))) +#define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n))) #define CsrStrChr strchr #define CsrStrStr strstr #define CsrMemSet memset @@ -58,15 +58,15 @@ CsrCharString *CsrStrCpy(CsrCharString *dest, const CsrCharString *src); CsrCharString *CsrStrNCpy(CsrCharString *dest, const CsrCharString *src, CsrSize count); CsrCharString *CsrStrCat(CsrCharString *dest, const CsrCharString *src); CsrCharString *CsrStrNCat(CsrCharString *dest, const CsrCharString *src, CsrSize count); -CsrInt32 CsrMemCmp(const void *buf1, const void *buf2, CsrSize count); -CsrInt32 CsrStrCmp(const CsrCharString *string1, const CsrCharString *string2); -CsrInt32 CsrStrNCmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count); +s32 CsrMemCmp(const void *buf1, const void *buf2, CsrSize count); +s32 CsrStrCmp(const CsrCharString *string1, const CsrCharString *string2); +s32 CsrStrNCmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count); CsrCharString *CsrStrChr(const CsrCharString *string, CsrCharString c); CsrCharString *CsrStrStr(const CsrCharString *string1, const CsrCharString *string2); void *CsrMemSet(void *dest, u8 c, CsrSize count); CsrSize CsrStrLen(const CsrCharString *string); #endif /* !CSR_USE_STDC_LIB */ -CsrInt32 CsrVsnprintf(CsrCharString *string, CsrSize count, const CsrCharString *format, va_list args); +s32 CsrVsnprintf(CsrCharString *string, CsrSize count, const CsrCharString *format, va_list args); /*------------------------------------------------------------------*/ /* Non-standard utility functions */ |