php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect TSRMLS_CC usage.

Browse Source 
Fix com_create_guid()
This commit is contained in:
Wez Furlong
2003-02-18 19:03:44 +00:00
parent 32e0c8161c
commit 4c4d77d23e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/rpc/com/com.c
+1 -1
View File
@@ -841,7 +841,7 @@ static ZEND_FUNCTION(com_create_guid)
ZEND_WRONG_PARAM_COUNT();
}
if (CoCreateGuid(&retval) && StringFromCLSID(&retval, &guid_string)) {
if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) == S_OK) {
Z_TYPE_P(return_value) = IS_STRING;
Z_STRVAL_P(return_value) = php_OLECHAR_to_char(guid_string, &Z_STRLEN_P(return_value), CP_ACP, 0);
main/streams/streams.c
+6 -8
View File
@@ -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;
}
}