thodg/libgit2

diff --git a/src/fileops.c b/src/fileops.c
index cf77ad1..aea8075 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -60,7 +60,7 @@ int git_futils_creat_locked(const char *path, const mode_t mode)
 #ifdef GIT_WIN32
 	git_win32_path buf;
 
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	fd = _wopen(buf, O_WRONLY | O_CREAT | O_TRUNC |
 		O_EXCL | O_BINARY | O_CLOEXEC, mode);
 #else
diff --git a/src/path.c b/src/path.c
index c9716ef..9a4b8c4 100644
--- a/src/path.c
+++ b/src/path.c
@@ -492,7 +492,7 @@ bool git_path_is_empty_dir(const char *path)
 	if (!git_path_isdir(path)) return false;
 
 	git_buf_printf(&pathbuf, "%s\\*", path);
-	git__win32_path_from_c(wbuf, git_buf_cstr(&pathbuf));
+	git_win32_path_from_c(wbuf, git_buf_cstr(&pathbuf));
 
 	hFind = FindFirstFileW(wbuf, &ffd);
 	if (INVALID_HANDLE_VALUE == hFind) {
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 6f182c9..8decd8d 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -920,7 +920,7 @@ static int winhttp_connect(
 		return -1;
 
 	/* Prepare host */
-	git__win32_path_from_c(host, t->host);
+	git_win32_path_from_c(host, t->host);
 
 	/* Establish session */
 	t->session = WinHttpOpen(
@@ -934,7 +934,7 @@ static int winhttp_connect(
 		giterr_set(GITERR_OS, "Failed to init WinHTTP");
 		return -1;
 	}
-	
+
 	/* Establish connection */
 	t->connection = WinHttpConnect(
 			t->session,
diff --git a/src/win32/dir.c b/src/win32/dir.c
index 65472dc..0ea5124 100644
--- a/src/win32/dir.c
+++ b/src/win32/dir.c
@@ -39,7 +39,7 @@ git__DIR *git__opendir(const char *dir)
 	if (!new->dir)
 		goto fail;
 
-	git__win32_path_from_c(filter_w, filter);
+	git_win32_path_from_c(filter_w, filter);
 	new->h = FindFirstFileW(filter_w, &new->f);
 
 	if (new->h == INVALID_HANDLE_VALUE) {
@@ -79,7 +79,7 @@ int git__readdir_ext(
 	if (wcslen(d->f.cFileName) >= sizeof(entry->d_name))
 		return -1;
 
-	git__win32_path_to_c(entry->d_name, d->f.cFileName);
+	git_win32_path_to_c(entry->d_name, d->f.cFileName);
 	entry->d_ino = 0;
 
 	*result = entry;
@@ -115,7 +115,7 @@ void git__rewinddir(git__DIR *d)
 	if (!init_filter(filter, sizeof(filter), d->dir))
 		return;
 
-	git__win32_path_from_c(filter_w, filter);
+	git_win32_path_from_c(filter_w, filter);
 	d->h = FindFirstFileW(filter_w, &d->f);
 
 	if (d->h == INVALID_HANDLE_VALUE)
diff --git a/src/win32/posix.h b/src/win32/posix.h
index 9628771..5f924a0 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -24,7 +24,7 @@ GIT_INLINE(int) p_mkdir(const char *path, mode_t mode)
 {
 	git_win32_path buf;
 	GIT_UNUSED(mode);
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return _wmkdir(buf);
 }
 
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
index 437ded2..3a626f7 100644
--- a/src/win32/posix_w32.c
+++ b/src/win32/posix_w32.c
@@ -17,7 +17,7 @@
 int p_unlink(const char *path)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	_wchmod(buf, 0666);
 	return _wunlink(buf);
 }
@@ -63,7 +63,7 @@ static int do_lstat(
 	wchar_t lastch;
 	int flen;
 
-	flen = git__win32_path_from_c(fbuf, file_name);
+	flen = git_win32_path_from_c(fbuf, file_name);
 
 	/* truncate trailing slashes */
 	for (; flen > 0; --flen) {
@@ -189,7 +189,7 @@ int p_readlink(const char *link, char *target, size_t target_len)
 		}
 	}
 
-	git__win32_path_from_c(link_w, link);
+	git_win32_path_from_c(link_w, link);
 
 	hFile = CreateFileW(link_w,			// file to open
 			GENERIC_READ,			// open for reading
@@ -258,7 +258,7 @@ int p_open(const char *path, int flags, ...)
 	git_win32_path buf;
 	mode_t mode = 0;
 
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 
 	if (flags & O_CREAT) {
 		va_list arg_list;
@@ -274,7 +274,7 @@ int p_open(const char *path, int flags, ...)
 int p_creat(const char *path, mode_t mode)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return _wopen(buf, _O_WRONLY | _O_CREAT | _O_TRUNC | _O_BINARY, mode);
 }
 
@@ -317,14 +317,14 @@ int p_stat(const char* path, struct stat* buf)
 int p_chdir(const char* path)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return _wchdir(buf);
 }
 
 int p_chmod(const char* path, mode_t mode)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return _wchmod(buf, mode);
 }
 
@@ -332,7 +332,7 @@ int p_rmdir(const char* path)
 {
 	int error;
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 
 	error = _wrmdir(buf);
 
@@ -349,7 +349,7 @@ int p_rmdir(const char* path)
 int p_hide_directory__w32(const char *path)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return (SetFileAttributesW(buf, FILE_ATTRIBUTE_HIDDEN) != 0) ? 0 : -1;
 }
 
@@ -359,7 +359,7 @@ char *p_realpath(const char *orig_path, char *buffer)
 	git_win32_path orig_path_w;
 	git_win32_path buffer_w;
 
-	git__win32_path_from_c(orig_path_w, orig_path);
+	git_win32_path_from_c(orig_path_w, orig_path);
 
 	/* Implicitly use GetCurrentDirectory which can be a threading issue */
 	ret = GetFullPathNameW(orig_path_w, GIT_WIN_PATH_UTF16, buffer_w, NULL);
@@ -450,7 +450,7 @@ int p_setenv(const char* name, const char* value, int overwrite)
 int p_access(const char* path, mode_t mode)
 {
 	git_win32_path buf;
-	git__win32_path_from_c(buf, path);
+	git_win32_path_from_c(buf, path);
 	return _waccess(buf, mode);
 }
 
@@ -459,8 +459,8 @@ int p_rename(const char *from, const char *to)
 	git_win32_path wfrom;
 	git_win32_path wto;
 
-	git__win32_path_from_c(wfrom, from);
-	git__win32_path_from_c(wto, to);
+	git_win32_path_from_c(wfrom, from);
+	git_win32_path_from_c(wto, to);
 	return MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) ? 0 : -1;
 }
 
diff --git a/src/win32/utf-conv.h b/src/win32/utf-conv.h
index 835dc75..1d008db 100644
--- a/src/win32/utf-conv.h
+++ b/src/win32/utf-conv.h
@@ -11,22 +11,25 @@
 #ifndef INCLUDE_git_utfconv_h__
 #define INCLUDE_git_utfconv_h__
 
+/* Maximum characters in a Windows path plus one for NUL byte */
 #define GIT_WIN_PATH_UTF16 (260 + 1)
+
+/* Maximum bytes necessary to convert a full-length UTF16 path to UTF8 */
 #define GIT_WIN_PATH_UTF8  (260 * 4 + 1)
 
 typedef wchar_t git_win32_path[GIT_WIN_PATH_UTF16];
 
-// dest_size is the size of dest in wchar_t's
+/* 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
+/* 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);
 
-GIT_INLINE(int) git__win32_path_from_c(git_win32_path dest, const char *src)
+GIT_INLINE(int) git_win32_path_from_c(git_win32_path dest, const char *src)
 {
 	return git__utf8_to_16(dest, GIT_WIN_PATH_UTF16, src);
 }
 
-GIT_INLINE(int) git__win32_path_to_c(char *dest, const git_win32_path src)
+GIT_INLINE(int) git_win32_path_to_c(char *dest, const git_win32_path src)
 {
 	return git__utf16_to_8(dest, GIT_WIN_PATH_UTF8, src);
 }
diff --git a/tests-clar/clar_libgit2.c b/tests-clar/clar_libgit2.c
index 9e0fbfb..305581e 100644
--- a/tests-clar/clar_libgit2.c
+++ b/tests-clar/clar_libgit2.c
@@ -61,7 +61,7 @@ char *cl_getenv(const char *name)
 	wchar_t *value_utf16;
 	char *value_utf8;
 
-	git__win32_path_from_c(name_utf16, name);
+	git_win32_path_from_c(name_utf16, name);
 	alloc_len = GetEnvironmentVariableW(name_utf16, NULL, 0);
 	if (alloc_len <= 0)
 		return NULL;
@@ -84,10 +84,10 @@ int cl_setenv(const char *name, const char *value)
 	git_win32_path name_utf16;
 	git_win32_path value_utf16;
 
-	git__win32_path_from_c(name_utf16, name);
+	git_win32_path_from_c(name_utf16, name);
 
 	if (value) {
-		git__win32_path_from_c(value_utf16, value);
+		git_win32_path_from_c(value_utf16, value);
 		cl_assert(SetEnvironmentVariableW(name_utf16, value_utf16));
 	} else {
 		/* Windows XP returns 0 (failed) when passing NULL for lpValue when
@@ -111,8 +111,8 @@ int cl_rename(const char *source, const char *dest)
 	git_win32_path dest_utf16;
 	unsigned retries = 1;
 
-	git__win32_path_from_c(source_utf16, source);
-	git__win32_path_from_c(dest_utf16, dest);
+	git_win32_path_from_c(source_utf16, source);
+	git_win32_path_from_c(dest_utf16, dest);
 
 	while (!MoveFileW(source_utf16, dest_utf16)) {
 		/* Only retry if the error is ERROR_ACCESS_DENIED;