diff options
| author | marino <marino> | 2011-10-02 19:15:34 +0000 |
|---|---|---|
| committer | marino <marino> | 2011-10-02 19:15:34 +0000 |
| commit | 8d784ad5532761d8f93f4fe8602f014b9ec9981a (patch) | |
| tree | be52fcb60b7d1336b32c89b09bcb8d5f757be47f /net | |
| parent | 46f4aa0473fdcf64da71203a032a7ed588818bd3 (diff) | |
| download | pkgsrc-8d784ad5532761d8f93f4fe8602f014b9ec9981a.tar.gz | |
PR#45210: Fix pkgsrc bootstrap with gcc 4.6
Libfetch build failure with gcc 4.6 is due to the a couple of assigned
variables not getting used. This patch allows systems like Debian and
OpenIndiana to bootstrap pkgsrc.
Diffstat (limited to 'net')
| -rw-r--r-- | net/libfetch/files/ftp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index 33d1b644cc8..fac08eee3e3 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.38 2011/08/21 16:28:27 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.39 2011/10/02 19:15:34 marino Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org> @@ -619,7 +619,6 @@ static void ftp_closefn(void *v) { struct ftpio *io; - int r; io = (struct ftpio *)v; if (io == NULL) { @@ -635,7 +634,7 @@ ftp_closefn(void *v) 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 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file, const char *op_ar 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 @@ retry_mode: uint16_t p; #if defined(IPV6_PORTRANGE) || defined(IP_PORTRANGE) int arg; + int low = CHECK_FLAG('l'); #endif int d; char hname[INET6_ADDRSTRLEN]; |