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/standard/ftok.c | |
| 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/standard/ftok.c')
| -rw-r--r-- | ext/standard/ftok.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c index 536fccaa3e..e74fd6b65e 100644 --- a/ext/standard/ftok.c +++ b/ext/standard/ftok.c @@ -35,27 +35,27 @@ PHP_FUNCTION(ftok) size_t pathname_len, proj_len; key_t k; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ps", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { return; } if (pathname_len == 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid"); + php_error_docref(NULL, E_WARNING, "Pathname is invalid"); RETURN_LONG(-1); } if (proj_len != 1){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid"); + php_error_docref(NULL, E_WARNING, "Project identifier is invalid"); RETURN_LONG(-1); } - if (php_check_open_basedir(pathname TSRMLS_CC)) { + if (php_check_open_basedir(pathname)) { RETURN_LONG(-1); } k = ftok(pathname, proj[0]); if (k == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "ftok() failed - %s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "ftok() failed - %s", strerror(errno)); } RETURN_LONG(k); |