Merge pull request libgit2#4014 from bokic/patch-1

Edward Thomson · web-flow · commit 15769731a241 · 2016-12-07T15:01:20.000Z
Properly pass `wchar *` type to giterr_set
diff --git a/src/win32/w32_util.h b/src/win32/w32_util.h
@@ -174,7 +174,7 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat(
 			/* st_size gets the UTF-8 length of the target name, in bytes,
 			 * not counting the NULL terminator */
 			if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) {
-				giterr_set(GITERR_OS, "Could not convert reparse point name for '%s'", path);
+				giterr_set(GITERR_OS, "Could not convert reparse point name for '%ls'", path);
 				return -1;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat(`
`174`	`174`	`/* st_size gets the UTF-8 length of the target name, in bytes,`
`175`	`175`	`* not counting the NULL terminator */`
`176`	`176`	`if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) {`
`177`		`- giterr_set(GITERR_OS, "Could not convert reparse point name for '%s'", path);`
	`177`	`+ giterr_set(GITERR_OS, "Could not convert reparse point name for '%ls'", path);`
`178`	`178`	`return -1;`
`179`	`179`	`}`
`180`	`180`	`}`