Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Win32: fix path slashes (diet version) #3408

Merged
merged 9 commits into from
Oct 13, 2013

Conversation

Karlson2k
Copy link
Member

This is bugfix part of larger PR #3374
Cherry-picked minimal set of commits to fix "slash"-errors.

@Karlson2k
Copy link
Member Author

@wsoltys As requested.

jenkins build this please

return -1;
}

fd = _open_osfhandle((intptr_t)((HANDLE)hFileDup), 0);
if (fd == -1)
{
CLog::Log(LOGERROR, "CWINFileSMB Stat: fd == -1");
CLog::Log(LOGERROR, __FUNCTION__ ": Stat: fd == -1");

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@wsoltys
Copy link

wsoltys commented Oct 12, 2013

Address jmarshall's points and I'm fine with it.

@Karlson2k
Copy link
Member Author

@jmarshallnz FixSlashes was renamed and moved to URIUtils. Less parameters.
I'll implement other functions for fixing slashes without duplicates (in other PR).
All 'FUNCTION' was moved to parameters of Log() calls.

@jmarshallnz
Copy link
Contributor

jenkins build this please


if( url.GetProtocol().Equals("file", false) )
if(url.GetProtocol() == "file")
{
// file://drive[:]/path

This comment was marked as spam.

This comment was marked as spam.

@elupus
Copy link
Contributor

elupus commented Oct 13, 2013

Looks good to me. The android build failures are not related

jmarshallnz added a commit that referenced this pull request Oct 13, 2013
@jmarshallnz jmarshallnz merged commit adc1844 into xbmc:master Oct 13, 2013
@Karlson2k Karlson2k deleted the win32_fix_path_slashes_small branch October 15, 2013 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants