diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/recode | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/recode')
| -rw-r--r-- | ext/recode/recode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/recode/recode.c b/ext/recode/recode.c index a70a4fcb2c..ea2374556f 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -149,25 +149,25 @@ PHP_FUNCTION(recode_string) size_t req_len, str_len; char *req, *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &req, &req_len, &str, &str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &req, &req_len, &str, &str_len) == FAILURE) { return; } request = recode_new_request(ReSG(outer)); if (request == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot allocate request structure"); + php_error_docref(NULL, E_WARNING, "Cannot allocate request structure"); RETURN_FALSE; } if (!recode_scan_request(request, req)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode request '%s'", req); + php_error_docref(NULL, E_WARNING, "Illegal recode request '%s'", req); goto error_exit; } recode_buffer_to_buffer(request, str, str_len, &r, &r_len, &r_alen); if (!r) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed."); + php_error_docref(NULL, E_WARNING, "Recoding failed."); error_exit: RETVAL_FALSE; } else { @@ -192,7 +192,7 @@ PHP_FUNCTION(recode_file) php_stream *instream, *outstream; FILE *in_fp, *out_fp; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "srr", &req, &req_len, &input, &output) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "srr", &req, &req_len, &input, &output) == FAILURE) { return; } @@ -209,17 +209,17 @@ PHP_FUNCTION(recode_file) request = recode_new_request(ReSG(outer)); if (request == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot allocate request structure"); + php_error_docref(NULL, E_WARNING, "Cannot allocate request structure"); RETURN_FALSE; } if (!recode_scan_request(request, req)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal recode request '%s'", req); + php_error_docref(NULL, E_WARNING, "Illegal recode request '%s'", req); goto error_exit; } if (!recode_file_to_file(request, in_fp, out_fp)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed."); + php_error_docref(NULL, E_WARNING, "Recoding failed."); goto error_exit; } |