diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:14:50 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:14:50 +0200 |
| commit | 902d39a3a79c6efe93c8879575fdd5a759cf03de (patch) | |
| tree | e6ec0af8ac4333de34f581c2c7b5a2eb93e635a1 /win32/codepage.c | |
| parent | 581f0141b6dd8d20e71612f90b01507ed0783db8 (diff) | |
| download | php-git-902d39a3a79c6efe93c8879575fdd5a759cf03de.tar.gz | |
Trim trailing whitespace in source code files
Diffstat (limited to 'win32/codepage.c')
| -rw-r--r-- | win32/codepage.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win32/codepage.c b/win32/codepage.c index 8823219184..25cd4d786f 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -96,7 +96,7 @@ PW32CP wchar_t *php_win32_cp_conv_to_w(DWORD cp, DWORD flags, const char* in, si PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size_t *out_len) {/*{{{*/ wchar_t *ret = NULL; - const char *idx = in, *end; + const char *idx = in, *end; assert(in && in_len ? in[in_len] == '\0' : 1); @@ -385,7 +385,7 @@ PW32CP wchar_t *php_win32_cp_env_any_to_w(const char* env) } while (NULL != (cur = strchr(prev, '\0')) && cur++ && *cur && bin_len + (cur - prev) < 32760); - envw = (wchar_t *) malloc((bin_len + 3) * sizeof(wchar_t)); + envw = (wchar_t *) malloc((bin_len + 3) * sizeof(wchar_t)); if (!envw) { SET_ERRNO_FROM_WIN32_CODE(ERROR_OUTOFMEMORY); return NULL; @@ -524,7 +524,7 @@ PW32CP const struct php_win32_cp *php_win32_cp_cli_do_restore(DWORD id) /* {{{ proto bool sapi_windows_cp_set(int cp) * Set process codepage. */ -PHP_FUNCTION(sapi_windows_cp_set) +PHP_FUNCTION(sapi_windows_cp_set) { zend_long id; const struct php_win32_cp *cp; @@ -605,12 +605,12 @@ PHP_FUNCTION(sapi_windows_cp_conv) php_error_docref(NULL, E_WARNING, "String is too long"); RETURN_NULL(); } - + if (IS_LONG == Z_TYPE_P(z_in_cp)) { if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_in_cp))) { php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_in_cp)); RETURN_NULL(); - } + } in_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_in_cp)); if (!in_cp) { @@ -631,7 +631,7 @@ PHP_FUNCTION(sapi_windows_cp_conv) if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_out_cp))) { php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_out_cp)); RETURN_NULL(); - } + } out_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_out_cp)); if (!out_cp) { |