summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-02-18 19:03:44 +0000
committerWez Furlong <wez@php.net>2003-02-18 19:03:44 +0000
commit4c4d77d23e548e2f421fbfbfe659b20a49203ea6 (patch)
tree6d10d508c96e4c0f257dd4ac3542407cde69a43a /main
parent32e0c8161ca28adc16e651c0f106b69c2d1f6403 (diff)
downloadphp-git-4c4d77d23e548e2f421fbfbfe659b20a49203ea6.tar.gz
Fix incorrect TSRMLS_CC usage.
Fix com_create_guid()
Diffstat (limited to 'main')
-rwxr-xr-xmain/streams/streams.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index bb72a4f801..d2ef95dda8 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1198,6 +1198,7 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size
size_t readchunk;
size_t haveread = 0;
size_t didread;
+ php_stream_statbuf ssbuf;
#if HAVE_MMAP
int srcfd;
#endif
@@ -1243,14 +1244,11 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size
}
#endif
- {
- php_stream_statbuf sbuf;
- if (php_stream_stat(src, &sbuf TSRMLS_CC) == 0) {
- /* in the event that the source file is 0 bytes, return 1 to indicate success
- * because opening the file to write had already created a copy */
- if (sbuf.sb.st_size == 0) {
- return 1;
- }
+ if (php_stream_stat(src, &ssbuf) == 0) {
+ /* in the event that the source file is 0 bytes, return 1 to indicate success
+ * because opening the file to write had already created a copy */
+ if (ssbuf.sb.st_size == 0) {
+ return 1;
}
}