mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFH: invert the logics - FLAG_FCLOSE -> FLAG_NO_FCLOSE

Browse Source
This commit is contained in:
Antony Dovgal 2008-07-23 11:25:14 +00:00
parent 16ace1828e
commit 28a22396d4
9 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/bz2/bz2.c
View File

@ -247,7 +247,6 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **) &fd, REPORT_ERRORS)) {
bz_file = BZ2_bzdopen(fd, mode);
}
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
}
/* remove the file created by php_stream_open_wrapper(), it is not needed since BZ2 functions
@ -261,7 +260,6 @@ PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper,
if (bz_file) {
retstream = _php_stream_bz2open_from_BZFILE(bz_file, mode, stream STREAMS_REL_CC TSRMLS_CC);
if (retstream) {
retstream->flags |= PHP_STREAM_FLAG_FCLOSE;
return retstream;
}

2
ext/standard/dir.c
View File

@ -220,6 +220,8 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
if (dirp == NULL) {
RETURN_FALSE;
}
dirp->flags |= PHP_STREAM_FLAG_NO_FCLOSE;
php_set_default_dir(dirp->rsrc_id TSRMLS_CC);

6
ext/standard/file.c
View File

@ -856,8 +856,6 @@ PHP_NAMED_FUNCTION(php_if_tmpfile)
stream = php_stream_fopen_tmpfile();
if (stream) {
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
php_stream_to_zval(stream, return_value);
} else {
RETURN_FALSE;
@ -888,8 +886,6 @@ PHP_NAMED_FUNCTION(php_if_fopen)
RETURN_FALSE;
}
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
php_stream_to_zval(stream, return_value);
}
/* }}} */
@ -907,7 +903,7 @@ PHPAPI PHP_FUNCTION(fclose)
PHP_STREAM_TO_ZVAL(stream, &arg1);
if (!(stream->flags & PHP_STREAM_FLAG_FCLOSE)) {
if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a valid stream resource", stream->rsrc_id);
RETURN_FALSE;
}

2
ext/standard/fsock.c
View File

@ -79,8 +79,6 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
stream = php_stream_xport_create(hostname, hostname_len, ENFORCE_SAFE_MODE | REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey, &tv, NULL, &errstr, &err);
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
if (port > 0) {
efree(hostname);
}

2
ext/standard/proc_open.c
View File

@ -969,7 +969,7 @@ PHP_FUNCTION(proc_open)
zval *retfp;
/* nasty hack; don't copy it */
stream->flags |= PHP_STREAM_FLAG_NO_SEEK | PHP_STREAM_FLAG_FCLOSE;
stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
MAKE_STD_ZVAL(retfp);
php_stream_to_zval(stream, retfp);

6
ext/standard/streamsfuncs.c
View File

@ -155,8 +155,6 @@ PHP_FUNCTION(stream_socket_client)
RETURN_FALSE;
}
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
if (errstr) {
efree(errstr);
}
@ -204,8 +202,6 @@ PHP_FUNCTION(stream_socket_server)
STREAM_XPORT_SERVER | flags,
NULL, NULL, context, &errstr, &err);
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
if (stream == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to connect to %s (%s)", host, errstr == NULL ? "Unknown error" : errstr);
}
@ -271,8 +267,6 @@ PHP_FUNCTION(stream_socket_accept)
&tv, &errstr
TSRMLS_CC) && clistream) {
clistream->flags |= PHP_STREAM_FLAG_FCLOSE;
if (peername) {
ZVAL_STRINGL(zpeername, peername, peername_len, 0);
}

1
ext/zip/zip_stream.c
View File

@ -140,7 +140,6 @@ php_stream *php_stream_zip_open(char *filename, char *path, char *mode STREAMS_D
if (!stream) {
return NULL;
} else {
stream->flags |= PHP_STREAM_FLAG_FCLOSE;
return stream;
}

2
main/php_streams.h
View File

@ -183,7 +183,7 @@ struct _php_stream_wrapper {
#define PHP_STREAM_FLAG_IS_DIR 64
#define PHP_STREAM_FLAG_FCLOSE 128
#define PHP_STREAM_FLAG_NO_FCLOSE 128
struct _php_stream {
php_stream_ops *ops;

4
sapi/cli/php_cli.c
View File

@ -502,10 +502,6 @@ static void cli_register_file_handles(TSRMLS_D) /* {{{ */
return;
}
s_in->flags |= PHP_STREAM_FLAG_FCLOSE;
s_out->flags |= PHP_STREAM_FLAG_FCLOSE;
s_err->flags |= PHP_STREAM_FLAG_FCLOSE;
#if PHP_DEBUG
/* do not close stdout and stderr */
s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;