aboutsummaryrefslogtreecommitdiff
path: root/src/string.cpp
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-07-31 11:36:00 +0100
committerGinger Bill <bill@gingerbill.org>2017-07-31 11:36:00 +0100
commit0fae31fb545b474359359fd644911fa335c5c282 (patch)
tree5077da92ae70949b014c981d91467d67ff127e2f /src/string.cpp
parent8987a6630c8ec43da770dd92c10f6b92e17201f2 (diff)
Extra type safety; Fix typos
Diffstat (limited to 'src/string.cpp')
-rw-r--r--src/string.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/string.cpp b/src/string.cpp
index f9aaa8e11..20c5e28c9 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -196,7 +196,6 @@ gb_inline bool str_has_prefix(String s, String prefix) {
gb_inline isize string_extension_position(String str) {
isize dot_pos = -1;
isize i = str.len;
- bool seen_dot = false;
while (i --> 0) {
if (str[i] == GB_PATH_SEPARATOR)
break;
@@ -317,14 +316,14 @@ String16 string_to_string16(gbAllocator a, String s) {
return make_string16(nullptr, 0);
}
- len = convert_multibyte_to_widechar(cast(char *)s.text, s.len, nullptr, 0);
+ len = convert_multibyte_to_widechar(cast(char *)s.text, cast(int)s.len, nullptr, 0);
if (len == 0) {
return make_string16(nullptr, 0);
}
text = gb_alloc_array(a, wchar_t, len+1);
- len1 = convert_multibyte_to_widechar(cast(char *)s.text, s.len, text, len);
+ len1 = convert_multibyte_to_widechar(cast(char *)s.text, cast(int)s.len, text, cast(int)len);
if (len1 == 0) {
gb_free(a, text);
return make_string16(nullptr, 0);
@@ -343,7 +342,7 @@ String string16_to_string(gbAllocator a, String16 s) {
return make_string(nullptr, 0);
}
- len = convert_widechar_to_multibyte(s.text, s.len, nullptr, 0);
+ len = convert_widechar_to_multibyte(s.text, cast(int)s.len, nullptr, 0);
if (len == 0) {
return make_string(nullptr, 0);
}
@@ -351,7 +350,7 @@ String string16_to_string(gbAllocator a, String16 s) {
text = gb_alloc_array(a, u8, len+1);
- len1 = convert_widechar_to_multibyte(s.text, s.len, cast(char *)text, len);
+ len1 = convert_widechar_to_multibyte(s.text, cast(int)s.len, cast(char *)text, cast(int)len);
if (len1 == 0) {
gb_free(a, text);
return make_string(nullptr, 0);