cvs: php4 /ext/sockets sockets.c /main safe_mode.c

rasmus Mon Jul 16 00:31:13 2001 EDT Modified files: /php4/ext/sockets sockets.c /php4/main safe_mode.c Log: Fix a couple of build warnings Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.55 php4/ext/sockets/sockets.c:1.56 --- php4/ext/sockets/sockets.c:1.55 Tue Jun 26 06:39:15 2001 +++ php4/ext/sockets/sockets.c Mon Jul 16 00:31:13 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.55 2001/06/26 10:39:15 sniper Exp $ */ +/* $Id: sockets.c,v 1.56 2001/07/16 04:31:13 rasmus Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1016,7 +1016,6 @@ long retval; php_sockaddr_storage sa_storage; struct sockaddr *sock_type = (struct sockaddr*) &sa_storage; - socklen_t length = sizeof(sa_storage); php_socket *php_sock; int argc = ZEND_NUM_ARGS(); @@ -1782,7 +1781,6 @@ convert_to_long_ex(arg3); if (Z_LVAL_PP(arg2) == SO_LINGER) { - zval *optval_array = NULL; optlen = sizeof(struct linger); if (getsockopt(php_sock->socket, Z_LVAL_PP(arg2), Z_LVAL_PP(arg3), (char*)&linger_val, &optlen) != 0) { Index: php4/main/safe_mode.c diff -u php4/main/safe_mode.c:1.33 php4/main/safe_mode.c:1.34 --- php4/main/safe_mode.c:1.33 Fri Jul 13 14:21:21 2001 +++ php4/main/safe_mode.c Mon Jul 16 00:31:13 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.33 2001/07/13 18:21:21 jflemer Exp $ */ +/* $Id: safe_mode.c,v 1.34 2001/07/16 04:31:13 rasmus Exp $ */ #include "php.h" @@ -97,7 +97,7 @@ } /* Trim off filename */ - if (s = strrchr(path,DEFAULT_SLASH)) { + if ((s = strrchr(path,DEFAULT_SLASH))) { *s = '\0'; } } else { /* CHECKUID_ALLOW_ONLY_DIR */