Mercurial > octave
diff liboctave/system/lo-sysdep.cc @ 25609:506419b5f817
maint: Strip trailing whitespace from source files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 13 Jul 2018 14:32:23 -0400 |
parents | 7dad5fa7e88e |
children | ffc858064239 |
line wrap: on
line diff
--- a/liboctave/system/lo-sysdep.cc Fri Jul 13 14:30:24 2018 -0400 +++ b/liboctave/system/lo-sysdep.cc Fri Jul 13 14:32:23 2018 -0400 @@ -97,7 +97,7 @@ // Find first file in directory. HANDLE hFind = FindFirstFileW (u8_to_wstring (path_name).c_str (), &ffd); - if (INVALID_HANDLE_VALUE == hFind) + if (INVALID_HANDLE_VALUE == hFind) { DWORD errCode = GetLastError (); char *errorText; @@ -207,7 +207,7 @@ // of the character encoding we are using. // 1. Check whether filename contains non-ASCII (UTF-8) characters - std::string::const_iterator first_non_ASCII = + std::string::const_iterator first_non_ASCII = std::find_if (orig_file_name.begin (), orig_file_name.end (), [](char c){return (c < 0 || c >= 128);}); if (first_non_ASCII == orig_file_name.end ()) @@ -218,11 +218,11 @@ // get short filename (8.3) from UTF-16 filename long length = GetShortPathNameW (w_orig_file_name, NULL, 0); - // Dynamically allocate the correct size + // Dynamically allocate the correct size // (terminating null char was included in length) wchar_t *w_short_file_name = new wchar_t[length]; length = GetShortPathNameW (w_orig_file_name, w_short_file_name, length); - + std::string short_file_name = u8_from_wstring (std::wstring (w_short_file_name)); if (short_file_name.compare (orig_file_name) != 0) @@ -233,7 +233,7 @@ size_t pos = (std::string (orig_file_name.begin (), first_non_ASCII)). find_last_of (octave::sys::file_ops::dir_sep_chars ()); std::string par_dir = orig_file_name.substr (0, pos+1); - + // create .oct_ascii directory // FIXME: We need to have write permission in this location. std::string oct_ascii_dir = par_dir + ".oct_ascii";