From 9a91bbc16cb0b32ce3bcc36c61b55a484aa4c075 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 2 Jan 2015 21:03:53 -0800 Subject: [PATCH] libobs: Make astrstri a bit more C-compliant I actually kind of hate how strstr returns a non-const even though it takes a const parameter, but I can understand why they made it that way. They really should have split it in to two functions though, one const and one non-const or something. But alas, ultimately for a C programmer who knows what they're doing it isn't a huge deal. --- libobs/util/dstr.c | 4 ++-- libobs/util/dstr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libobs/util/dstr.c b/libobs/util/dstr.c index e67012017..3f425ae79 100644 --- a/libobs/util/dstr.c +++ b/libobs/util/dstr.c @@ -162,7 +162,7 @@ int wstrcmpi_n(const wchar_t *str1, const wchar_t *str2, size_t n) return 0; } -char *astrstri(char *str, const char *find) +char *astrstri(const char *str, const char *find) { size_t len; @@ -173,7 +173,7 @@ char *astrstri(char *str, const char *find) do { if (astrcmpi_n(str, find, len) == 0) - return str; + return (char*)str; } while (*str++); return NULL; diff --git a/libobs/util/dstr.h b/libobs/util/dstr.h index adfefffbd..72fa86c80 100644 --- a/libobs/util/dstr.h +++ b/libobs/util/dstr.h @@ -46,7 +46,7 @@ EXPORT int wstrcmp_n(const wchar_t *str1, const wchar_t *str2, size_t n); EXPORT int astrcmpi_n(const char *str1, const char *str2, size_t n); EXPORT int wstrcmpi_n(const wchar_t *str1, const wchar_t *str2, size_t n); -EXPORT char *astrstri(char *str, const char *find); +EXPORT char *astrstri(const char *str, const char *find); EXPORT char *strdepad(char *str); EXPORT wchar_t *wcsdepad(wchar_t *str); -- GitLab