diff options
| -rw-r--r-- | net/libfetch/files/common.c | 3 | ||||
| -rw-r--r-- | net/libfetch/files/common.h | 3 | ||||
| -rw-r--r-- | net/libfetch/files/ftp.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/net/libfetch/files/common.c b/net/libfetch/files/common.c index 1bb555374a1..65d7a00d7f5 100644 --- a/net/libfetch/files/common.c +++ b/net/libfetch/files/common.c @@ -1,4 +1,4 @@ -/* $NetBSD: common.c,v 1.22 2010/01/22 13:21:09 joerg Exp $ */ +/* $NetBSD: common.c,v 1.23 2010/01/23 13:39:42 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org> @@ -238,7 +238,6 @@ fetch_reopen(int sd) conn->next_buf = NULL; conn->next_len = 0; conn->sd = sd; - conn->is_active = 0; return (conn); } diff --git a/net/libfetch/files/common.h b/net/libfetch/files/common.h index 08ffd356ef2..48d836d8ef6 100644 --- a/net/libfetch/files/common.h +++ b/net/libfetch/files/common.h @@ -1,4 +1,4 @@ -/* $NetBSD: common.h,v 1.13 2010/01/22 13:21:09 joerg Exp $ */ +/* $NetBSD: common.h,v 1.14 2010/01/23 13:39:42 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -72,7 +72,6 @@ struct fetchconn { const SSL_METHOD *ssl_meth; /* SSL method */ # endif #endif - int is_active; struct url *cache_url; int cache_af; diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index a84a22c98f2..01723b06f9e 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.32 2010/01/22 13:21:09 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.33 2010/01/23 13:39:42 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org> @@ -589,7 +589,6 @@ ftp_closefn(void *v) fetch_close(io->dconn); io->dconn = NULL; io->dir = -1; - io->cconn->is_active = 0; r = ftp_chkerr(io->cconn); fetch_cache_put(io->cconn, ftp_disconnect); free(io); @@ -610,7 +609,6 @@ ftp_setup(conn_t *cconn, conn_t *dconn, int mode) io->dconn = dconn; io->dir = mode; io->eof = io->err = 0; - io->cconn->is_active = 1; f = fetchIO_unopen(io, ftp_readfn, ftp_writefn, ftp_closefn); if (f == NULL) free(io); |