X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24528b0c1421ca7bde29027cecc005643dfae8cb..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/src/common/fs_inet.cpp?ds=sidebyside diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index d3b94f258d..cba29271dc 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -20,7 +20,7 @@ limitation) */ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "fs_inet.h" #endif #include "wx/wxprec.h" @@ -37,7 +37,6 @@ limitation) #if wxUSE_FILESYSTEM && wxUSE_FS_INET #ifndef WXPRECOMP -#include "wx/wx.h" #endif #include "wx/wfstream.h" @@ -74,7 +73,7 @@ static wxString StripProtocolAnchor(const wxString& location) else myloc = myloc.AfterFirst(wxT(':')); // fix malformed url: - if (myloc.Left(2) != wxT("//")) + if (myloc.Left(2) != wxT("//")) { if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc; else myloc = wxT("/") + myloc; @@ -89,13 +88,13 @@ static wxString StripProtocolAnchor(const wxString& location) bool wxInternetFSHandler::CanOpen(const wxString& location) { wxString p = GetProtocol(location); - if ((p == wxT("http")) || (p == wxT("ftp"))) + if ((p == wxT("http")) || (p == wxT("ftp"))) { wxURL url(p + wxT(":") + StripProtocolAnchor(location)); return (url.GetError() == wxURL_NOERR); } - else - return FALSE; + + return FALSE; } @@ -112,7 +111,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri if (info == NULL) { wxURL url(right); - if (url.GetError() == wxURL_NOERR) + if (url.GetError() == wxURL_NOERR) { s = url.GetInputStream(); content = url.GetProtocol().GetContentType(); @@ -140,15 +139,14 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri // Load item from cache: s = new wxFileInputStream(info->GetTemp()); - if (s) - { - return new wxFSFile(s, - right, - info->GetMime(), - GetAnchor(location), - wxDateTime::Now()); - } - else return (wxFSFile*) NULL; + if (!s) + return (wxFSFile*) NULL; + + return new wxFSFile(s, + right, + info->GetMime(), + GetAnchor(location), + wxDateTime::Now()); }