cvs: php4 /ext/standard ftp_fopen_wrapper.c /main/streams xp_socket.c

sebastian Sat May 17 02:21:34 2003 EDT Modified files: /php4/ext/standard ftp_fopen_wrapper.c /php4/main/streams xp_socket.c Log: Fix warnings. Index: php4/ext/standard/ftp_fopen_wrapper.c diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.55 php4/ext/standard/ftp_fopen_wrapper.c:1.56 --- php4/ext/standard/ftp_fopen_wrapper.c:1.55 Wed May 14 14:02:10 2003 +++ php4/ext/standard/ftp_fopen_wrapper.c Sat May 17 02:21:34 2003 @@ -18,7 +18,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.55 2003/05/14 18:02:10 pollita Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.56 2003/05/17 06:21:34 sebastian Exp $ */ #include "php.h" #include "php_globals.h" @@ -376,7 +376,7 @@ char tmp_line[512]; char ip[sizeof("123.123.123.123")]; unsigned short portno; - char *scratch, *hoststart = NULL; + char *hoststart = NULL; int result, use_ssl, use_ssl_on_data=0; php_stream *reuseid=NULL; size_t file_size = 0; Index: php4/main/streams/xp_socket.c diff -u php4/main/streams/xp_socket.c:1.10 php4/main/streams/xp_socket.c:1.11 --- php4/main/streams/xp_socket.c:1.10 Fri Apr 4 21:42:12 2003 +++ php4/main/streams/xp_socket.c Sat May 17 02:21:34 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_socket.c,v 1.10 2003/04/05 02:42:12 pollita Exp $ */ +/* $Id: xp_socket.c,v 1.11 2003/05/17 06:21:34 sebastian Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -380,9 +380,11 @@ static inline char *parse_ip_address(php_stream_xport_param *xparam, int *portno TSRMLS_DC) { char *colon; - char *p, *host = NULL; + char *host = NULL; #ifdef HAVE_IPV6 + char *p; + if (*(xparam->inputs.name) == '[') { /* IPV6 notation to specify raw address with port (i.e. [fe80::1]:80) */ p = memchr(xparam->inputs.name + 1, ']', xparam->inputs.namelen - 2);