Fix warnings.

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 2c2ad71166749571d23fc03651889dcb5ef5af29..194138aee450be2179c806f829dbd1e6642c01b0 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -376,7 +376,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
        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;

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 2b6015ac60b10b578e7266cedd479837aefdb84c..9fd5a4ca8d8cd0331636d3ccb34d468dd6610f75 100644 (file)
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -380,9 +380,11 @@ static inline int parse_unix_address(php_stream_xport_param *xparam, struct sock
 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);