summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>1998-12-18 14:32:48 +0000
committerdes <des@FreeBSD.org>1998-12-18 14:32:48 +0000
commitb8af0c7d8dfc8fbe75c0f0479140cabd9d53d930 (patch)
tree9bfaf75aae3b51fe4bad245f6f5bbaf8baf8fafc /lib
parentab07ab9139e4a2d73f282d0a2561ce56fa53ddea (diff)
downloadFreeBSD-src-b8af0c7d8dfc8fbe75c0f0479140cabd9d53d930.zip
FreeBSD-src-b8af0c7d8dfc8fbe75c0f0479140cabd9d53d930.tar.gz
Don't specify a language to compile_et.
Rename fetchConnect to _fetch_connect since it's internal.
Diffstat (limited to 'lib')
-rw-r--r--lib/libfetch/Makefile4
-rw-r--r--lib/libfetch/common.c4
-rw-r--r--lib/libfetch/common.h4
-rw-r--r--lib/libfetch/ftp.c6
-rw-r--r--lib/libfetch/http.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 7bd77dc..0be36ff 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1998/12/15 12:24:26 des Exp $
+# $Id: Makefile,v 1.10 1998/12/16 10:24:52 des Exp $
LIB= fetch
CFLAGS+= -I. -Wall -pedantic
@@ -45,6 +45,6 @@ hdrs: fetch_err.h
.ORDER: fetch_err.c fetch_err.h
fetch_err.c fetch_err.h: fetch_err.et
- compile_et -lang c ${.ALLSRC}
+ compile_et ${.ALLSRC}
.include <bsd.lib.mk>
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 88d23d4..a04cb0b 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: common.c,v 1.2 1998/11/06 22:14:08 des Exp $
+ * $Id: common.c,v 1.3 1998/12/16 10:24:52 des Exp $
*/
#include <sys/param.h>
@@ -199,7 +199,7 @@ _fetch_info(char *fmt, ...)
* Establish a TCP connection to the specified port on the specified host.
*/
int
-fetchConnect(char *host, int port, int verbose)
+_fetch_connect(char *host, int port, int verbose)
{
struct sockaddr_in sin;
struct hostent *he;
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index 9ea23ea..eb34033 100644
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.h
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: common.h,v 1.2 1998/11/06 22:14:08 des Exp $
+ * $Id: common.h,v 1.3 1998/12/16 10:24:53 des Exp $
*/
#ifndef _COMMON_H_INCLUDED
@@ -41,7 +41,7 @@ struct fetcherr {
void _fetch_seterr(struct fetcherr *, int);
void _fetch_syserr(void);
int _fetch_info(char *fmt, ...);
-int fetchConnect(char *, int, int);
+int _fetch_connect(char *, int, int);
#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n)
#define _http_seterr(n) _fetch_seterr(_http_errlist, n)
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 2d05424..22993ee7 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ftp.c,v 1.9 1998/12/16 11:44:31 des Exp $
+ * $Id: ftp.c,v 1.10 1998/12/16 15:29:03 des Exp $
*/
/*
@@ -289,12 +289,12 @@ _ftp_connect(char *host, int port, char *user, char *pwd, int verbose)
}
if (q)
*q = 0;
- sd = fetchConnect(p, pp, verbose);
+ sd = _fetch_connect(p, pp, verbose);
if (q)
*q = ':';
} else {
/* no proxy, go straight to target */
- sd = fetchConnect(host, port, verbose);
+ sd = _fetch_connect(host, port, verbose);
}
/* check connection */
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index f5a065e..5c49ec5 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: http.c,v 1.8 1998/12/16 10:24:55 des Exp $
+ * $Id: http.c,v 1.9 1998/12/16 11:44:31 des Exp $
*/
/*
@@ -328,12 +328,12 @@ fetchGetHTTP(struct url *URL, char *flags)
host[len] = 0;
/* connect */
- sd = fetchConnect(host, port, verbose);
+ sd = _fetch_connect(host, port, verbose);
}
/* if no proxy is configured or could be contacted, try direct */
if (sd == -1) {
- if ((sd = fetchConnect(URL->host, URL->port, verbose)) == -1)
+ if ((sd = _fetch_connect(URL->host, URL->port, verbose)) == -1)
goto ouch;
}
OpenPOWER on IntegriCloud