From c215b8d14724d3f26e6dad8b1ba40cfd2dffe48d Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Thu, 4 Jan 2018 02:41:26 -0200 Subject: [PATCH] Trailing whitespaces on win32 Signed-off-by: Gabriel Caruso --- win32/codepage.h | 6 +++--- win32/getrusage.h | 4 ++-- win32/ioutil.h | 6 +++--- win32/time.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/win32/codepage.h b/win32/codepage.h index 9cfe3cd80b..cf3d72e39b 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -84,8 +84,8 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t if (php_win32_cp_use_unicode()) { /* First try the pure ascii conversion. This is the fastest way to do the - thing. Only applicable if the source string is UTF-8 in general. - While it could possibly be ok with European encodings, usage with + thing. Only applicable if the source string is UTF-8 in general. + While it could possibly be ok with European encodings, usage with Asian encodings can cause unintended side effects. Lookup the term "mojibake" if need more. */ ret = php_win32_cp_conv_ascii_to_w(in, in_len, out_len); @@ -97,7 +97,7 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t /* Still need this fallback with regard to possible broken data in the existing scripts. Broken data might be hardcoded in the user scripts, as UTF-8 settings was de facto ignored in - older PHP versions. The fallback can be removed later for + older PHP versions. The fallback can be removed later for the sake of purity, keep now for BC reasons. */ if (!ret) { const struct php_win32_cp *acp = php_win32_cp_get_by_id(GetACP()); diff --git a/win32/getrusage.h b/win32/getrusage.h index dd4b50cf39..0bed8ba6f6 100644 --- a/win32/getrusage.h +++ b/win32/getrusage.h @@ -21,8 +21,8 @@ /* * Note - * - * RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will + * + * RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will * therefore instead be used instead to emulate the behavior. */ diff --git a/win32/ioutil.h b/win32/ioutil.h index 60336dc35f..41773b306e 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -38,7 +38,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. - */ + */ #ifndef PHP_WIN32_IOUTIL_H #define PHP_WIN32_IOUTIL_H @@ -166,7 +166,7 @@ typedef enum { PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len); #ifdef PHP_EXPORTS -/* This symbols are needed only for the DllMain, but should not be exported +/* This symbols are needed only for the DllMain, but should not be exported or be available when used with PHP binaries. */ BOOL php_win32_ioutil_init(void); #endif @@ -177,7 +177,7 @@ __forceinline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in, siz {/*{{{*/ wchar_t *mb, *ret; size_t mb_len; - + mb = php_win32_cp_conv_any_to_w(in, in_len, &mb_len); if (!mb) { return NULL; diff --git a/win32/time.h b/win32/time.h index 4fe00bc21e..07afae487a 100644 --- a/win32/time.h +++ b/win32/time.h @@ -55,7 +55,7 @@ PHPAPI int nanosleep( const struct timespec * rqtp, struct timespec * rmtp ); PHPAPI int usleep(unsigned int useconds); #ifdef PHP_EXPORTS -/* This symbols are needed only for the DllMain, but should not be exported +/* This symbols are needed only for the DllMain, but should not be exported or be available when used with PHP binaries. */ void php_win32_init_gettimeofday(void); #endif -- 2.50.1