Re: pkg/45210: bootstrap fails with gcc-4.6 in libfetch (debian wheezy)

[John Marino <netbsd%marino.st@localhost>]

On 10/1/2011 11:13 PM, Alistair Crooks wrote:
> 
> Indeed - so line 687 should go in #ifdef IPV6_PORTRANGE/#endif guards, too.
> 
> Or move line 687 closer to where the variable is used, such as around line
> 861.
> 
> Regards,
> Alistair

Okay, I revised the patch along these lines.
It's probably a moot point anyway; I can't find IPV6_PORTRANGE and
friends defined anywhere, so the code between the macros doesn't build
in any case.

If Joerg is okay with it, I would be willing to take over PR/45210 and
commit this patch once the freeze lifts.

Regards,
John


--- files/ftp.c.orig    2011-10-01 17:08:28.658519066 +0200
+++ files/ftp.c 2011-10-02 16:56:35.040791739 +0200
@@ -619,7 +619,6 @@
 ftp_closefn(void *v)
 {
        struct ftpio *io;
-       int r;

        io = (struct ftpio *)v;
        if (io == NULL) {
@@ -635,7 +634,7 @@
        fetch_close(io->dconn);
        io->dconn = NULL;
        io->dir = -1;
-       r = ftp_chkerr(io->cconn);
+       ftp_chkerr(io->cconn);
        fetch_cache_put(io->cconn, ftp_disconnect);
        free(io);
        return;
@@ -677,14 +676,13 @@
        const char *bindaddr;
        const char *filename;
        int filenamelen, type;
-       int low, pasv, verbose;
+       int pasv, verbose;
        int e, sd = -1;
        socklen_t l;
        char *s;
        fetchIO *df;

        /* check flags */
-       low = CHECK_FLAG('l');
        pasv = !CHECK_FLAG('a');
        verbose = CHECK_FLAG('v');

@@ -850,6 +848,7 @@
                uint16_t p;
 #if defined(IPV6_PORTRANGE) || defined(IP_PORTRANGE)
                int arg;
+               int low = CHECK_FLAG('l');
 #endif
                int d;
                char hname[INET6_ADDRSTRLEN];