Properly pass wchar * type to giterr_set
#4014
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ethomson
reviewed
Dec 5, 2016
| @@ -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 '%S'", path); | |||
There was a problem hiding this comment.
Good catch.
IIRC, %S means that the argument should have the opposite size of the format string. So for the narrow printf family of functions, %S is a wchar_t * and for the Unicode/wide wprintf family of functions, %S is a narrow char *. Is my memory correct here?
If so, can we change this to %ls which (again, IIRC) indicates a wide string always, regardless of whether you're feeding it to printf or wprintf.
There was a problem hiding this comment.
Just checked with MinGW 5.3.0, and, you are right. %S seem to reverse the character width.
So, yes %ls format is better for this case.
|
Thanks! 😀 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ensure correct type is passed, no garbage text is sent, and mute compiler warning.