Discriminate path-specific and general UTF-X conversions

1 files changed, 14 insertions, 3 deletions

diff --git a/src/win32/utf-conv.h b/src/win32/utf-conv.h
index 4e602291e..7290f1d1a 100644
--- a/src/win32/utf-conv.h
+++ b/src/win32/utf-conv.h
@@ -16,8 +16,19 @@
 typedef wchar_t git_win32_path_utf16[GIT_WIN_PATH_UTF16];
 typedef char git_win32_path_utf8[GIT_WIN_PATH_UTF8];
 
-int git__utf8_to_16(git_win32_path_utf16 dest, const git_win32_path_utf8 src);
-int git__utf16_to_8(git_win32_path_utf8 dest, const git_win32_path_utf16 src);
+// dest_size is the size of dest in wchar_t's
+int git__utf8_to_16(wchar_t * dest, size_t dest_size, const char *src);
+// dest_size is the size of dest in char's
+int git__utf16_to_8(char *dest, size_t dest_size, const wchar_t *src);
 
-#endif
+GIT_INLINE(int) git__win32_path_utf8_to_16(git_win32_path_utf16 dest, const git_win32_path_utf8 src)
+{
+	return git__utf8_to_16(dest, GIT_WIN_PATH_UTF16, src);
+}
+
+GIT_INLINE(int) git__win32_path_utf16_to_8(git_win32_path_utf8 dest, const git_win32_path_utf16 src)
+{
+	return git__utf16_to_8(dest, GIT_WIN_PATH_UTF8, src);
+}
 
+#endif