diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-03 01:22:58 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-10 15:07:38 -0800 |
| commit | b7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc (patch) | |
| tree | 0e09490075ee4f9a75a77ef4168d8ee254c52e5b /main/main.c | |
| parent | 773c8b0c092a0e9ad5c5548815bcb9991d54d5c1 (diff) | |
| download | php-git-b7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc.tar.gz | |
trailing whitespace removal
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 276058ca3a..cfbc04f12e 100644 --- a/main/main.c +++ b/main/main.c @@ -1195,7 +1195,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ { /* new block to allow variable definition */ /* eval() errors do not affect exit_status or response code */ zend_bool during_eval = 0; - + if (type == E_PARSE) { zend_execute_data *execute_data = EG(current_execute_data); @@ -2473,7 +2473,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file) { zend_file_handle *prepend_file_p, *append_file_p; zend_file_handle prepend_file = {0}, append_file = {0}; -#if HAVE_BROKEN_GETCWD +#if HAVE_BROKEN_GETCWD volatile int old_cwd_fd = -1; #else char *old_cwd; @@ -2639,7 +2639,7 @@ PHPAPI int php_handle_auth_data(const char *auth) SG(request_info).auth_user = estrndup(user->val, user->len); SG(request_info).auth_password = estrdup(pass); ret = 0; - } + } zend_string_free(user); } } |