com php-src: Move & improve PHP_SOCKET_ERROR def: ext /sockets/php_sockets.h ext/sockets/sockets.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 14:29:11 +0000 |
| Subject: | com php-src: Move & improve PHP_SOCKET_ERROR def: ext /sockets/php_sockets.h ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71112@lists.php.net to get a copy of this message | ||
Commit: 9283b8aea4c681e39fed772543919bea4bba44a1
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Fri, 1 Feb 2013 14:39:56 +0100
Parents: 97d656fc82104d9879b59dba9b80773346ec1f61
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9283b8aea4c681e39fed772543919bea4bba44a1
Log:
Move & improve PHP_SOCKET_ERROR def
Changed paths:
M ext/sockets/php_sockets.h
M ext/sockets/sockets.c
Diff:
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 2b6700d..3762e02 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -64,13 +64,13 @@ PHP_SOCKETS_API int php_sockets_le_socket(void);
#define php_sockets_le_socket_name "Socket"
-/* Prototypes */
-#ifdef ilia_0 /* not needed, only causes a compiler warning */
-static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSRMLS_DC);
-static int php_accept_connect(php_socket *in_sock, php_socket **new_sock, struct sockaddr *la
TSRMLS_DC);
-static int php_read(php_socket *sock, void *buf, size_t maxlen, int flags);
-static char *php_strerror(int error TSRMLS_DC);
-#endif
+#define PHP_SOCKET_ERROR(socket, msg, errn) \
+ do { \
+ int _err = (errn); /* save value to avoid repeated calls to WSAGetLastError() on Windows */ \
+ (socket)->error = _err; \
+ SOCKETS_G(last_error) = _err; \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, _err,
php_strerror(_err TSRMLS_CC)); \
+ } while (0)
ZEND_BEGIN_MODULE_GLOBALS(sockets)
int last_error;
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 1cb36cd..6069fc5 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -117,10 +117,6 @@ static char *php_strerror(int error TSRMLS_DC);
#define PHP_NORMAL_READ 0x0001
#define PHP_BINARY_READ 0x0002
-#define PHP_SOCKET_ERROR(socket,msg,errn) socket->error = errn; \
- SOCKETS_G(last_error) = errn; \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn,
php_strerror(errn TSRMLS_CC))
-
static int le_socket;
#define le_socket_name php_sockets_le_socket_name