cvs: php4 /main streams.c

wez Sat Aug 25 05:20:18 2001 EDT Modified files: /php4/main streams.c Log: TSRMLS fix Index: php4/main/streams.c diff -u php4/main/streams.c:1.5 php4/main/streams.c:1.6 --- php4/main/streams.c:1.5 Mon Jul 30 04:24:40 2001 +++ php4/main/streams.c Sat Aug 25 05:20:18 2001 @@ -285,7 +285,7 @@ stream_cookie_seeker, stream_cookie_closer }; #else -/* TODO: use socketpair() to emulate fopecookie, as suggested by Hartmut ? */ +/* TODO: use socketpair() to emulate fopencookie, as suggested by Hartmut ? */ #endif PHPAPI int php_stream_cast(php_stream * stream, int castas, void ** ret, int show_err) @@ -334,12 +334,12 @@ exit_fail: if (show_err) { - TSRMLS_FETCH(); - /* these names depend on the values of the PHP_STREAM_AS_XXX defines in php_streams.h */ static const char * cast_names[3] = { "STDIO FILE*", "File Descriptor", "Socket Descriptor" }; + TSRMLS_FETCH(); + zend_error(E_WARNING, "%s(): cannot represent a stream of type %s as a %s", get_active_function_name(TSRMLS_C), stream->ops->label, @@ -363,6 +363,6 @@ * tab-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 tw=78 fdm=marker - * vim<600: sw=4 ts=4 tw=78 + * vim600: noet sw=4 ts=4 tw=78 fdm=marker + * vim<600: noet sw=4 ts=4 tw=78 */