wez Mon Dec 13 08:52:02 2004 EDT Modified files: /php-src/ext/standard streamsfuncs.c Log: Make it really build... http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.45&r2=1.46&ty=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.45 php-src/ext/standard/streamsfuncs.c:1.46 --- php-src/ext/standard/streamsfuncs.c:1.45 Sun Dec 12 11:10:35 2004 +++ php-src/ext/standard/streamsfuncs.c Mon Dec 13 08:52:01 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.45 2004/12/12 16:10:35 wez Exp $ */ +/* $Id: streamsfuncs.c,v 1.46 2004/12/13 13:52:01 wez Exp $ */ #include "php.h" #include "php_globals.h" @@ -43,7 +43,7 @@ #if HAVE_SOCKETPAIR /* {{{ proto array stream_socket_pair(int domain, int type, int protocol) - Creates a pair of indistinguishable socket streams */ + Creates a pair of connected, indistinguishable socket streams */ PHP_FUNCTION(stream_socket_pair) { long domain, type, protocol; @@ -57,8 +57,9 @@ } if (0 != socketpair(domain, type, protocol, pair)) { + char errbuf[256]; php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create sockets: [%d]: %s", - php_socket_errno(), php_socket_strerror(php_socket_errno())); + php_socket_errno(), php_socket_strerror(php_socket_errno(), errbuf, sizeof(errbuf))); RETURN_FALSE; } @@ -67,8 +68,8 @@ s1 = php_stream_sock_open_from_socket(pair[0], 0); s2 = php_stream_sock_open_from_socket(pair[1], 0); - add_next_index_zval(return_value, php_stream_get_resource_id(s1)); - add_next_index_zval(return_value, php_stream_get_resource_id(s2)); + add_next_index_resource(return_value, php_stream_get_resource_id(s1)); + add_next_index_resource(return_value, php_stream_get_resource_id(s2)); } /* }}} */ #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php