cvs: php4 /ext/sockets php_sockets.h sockets.c

mfischer Wed May 1 07:08:10 2002 EDT Modified files: /php4/ext/sockets php_sockets.h sockets.c Log: - Rename setopt and getopt to set_option and get_option, provide alias. Index: php4/ext/sockets/php_sockets.h diff -u php4/ext/sockets/php_sockets.h:1.23 php4/ext/sockets/php_sockets.h:1.24 --- php4/ext/sockets/php_sockets.h:1.23 Mon Apr 29 10:52:29 2002 +++ php4/ext/sockets/php_sockets.h Wed May 1 07:08:08 2002 @@ -22,7 +22,7 @@ #ifndef PHP_SOCKETS_H #define PHP_SOCKETS_H -/* $Id: php_sockets.h,v 1.23 2002/04/29 14:52:29 mfischer Exp $ */ +/* $Id: php_sockets.h,v 1.24 2002/05/01 11:08:08 mfischer Exp $ */ #if HAVE_SOCKETS @@ -72,8 +72,8 @@ PHP_FUNCTION(socket_sendmsg); PHP_FUNCTION(socket_readv); PHP_FUNCTION(socket_writev); -PHP_FUNCTION(socket_getopt); -PHP_FUNCTION(socket_setopt); +PHP_FUNCTION(socket_get_option); +PHP_FUNCTION(socket_set_option); PHP_FUNCTION(socket_shutdown); PHP_FUNCTION(socket_last_error); PHP_FUNCTION(socket_clear_error); Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.106 php4/ext/sockets/sockets.c:1.107 --- php4/ext/sockets/sockets.c:1.106 Wed May 1 06:41:10 2002 +++ php4/ext/sockets/sockets.c Wed May 1 07:08:08 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.106 2002/05/01 10:41:10 mfischer Exp $ */ +/* $Id: sockets.c,v 1.107 2002/05/01 11:08:08 mfischer Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -145,11 +145,16 @@ PHP_FE(socket_sendmsg, NULL) PHP_FE(socket_readv, NULL) PHP_FE(socket_writev, NULL) - PHP_FE(socket_getopt, NULL) - PHP_FE(socket_setopt, NULL) + PHP_FE(socket_get_option, NULL) + PHP_FE(socket_set_option, NULL) PHP_FE(socket_shutdown, NULL) PHP_FE(socket_last_error, NULL) PHP_FE(socket_clear_error, NULL) + + /* for downwards compatability */ + PHP_FALIAS(socket_getopt, socket_get_option, NULL) + PHP_FALIAS(socket_setopt, socket_set_option, NULL) + {NULL, NULL, NULL} }; /* }}} */ @@ -1690,9 +1695,9 @@ } /* }}} */ -/* {{{ proto mixed socket_getopt(resource socket, int level, int optname) +/* {{{ proto mixed socket_get_option(resource socket, int level, int optname) Gets socket options for the socket */ -PHP_FUNCTION(socket_getopt) +PHP_FUNCTION(socket_get_option) { zval *arg1; struct linger linger_val; @@ -1754,9 +1759,9 @@ } /* }}} */ -/* {{{ proto bool socket_setopt(resource socket, int level, int optname, int|array optval) +/* {{{ proto bool socket_set_option(resource socket, int level, int optname, int|array optval) Sets socket options for the socket */ -PHP_FUNCTION(socket_setopt) +PHP_FUNCTION(socket_set_option) { zval *arg1, *arg4; struct linger lv;