Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/net/libfetch/files/fetch.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pkgsrc/net/libfetch/files/fetch.c	2008/02/07 01:48:22	1.1
+++ pkgsrc/net/libfetch/files/fetch.c	2008/04/02 15:33:14	1.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.1 2008/02/07 01:48:22 joerg Exp $	*/
+/*	$NetBSD: fetch.c,v 1.2 2008/04/02 15:33:14 joerg Exp $	*/
 /*-
  * Copyright (c) 1998-2004 Dag-Erling CoýÅan Smgrav
  * All rights reserved.
@@ -69,7 +69,7 @@ static struct fetcherr url_errlist[] = {
  * read-only stream connected to the document referenced by the URL.
  * Also fill out the struct url_stat.
  */
-FILE *
+fetchIO *
 fetchXGet(struct url *URL, struct url_stat *us, const char *flags)
 {
 	int direct;
@@ -95,7 +95,7 @@ fetchXGet(struct url *URL, struct url_st
  * Select the appropriate protocol for the URL scheme, and return a
  * read-only stream connected to the document referenced by the URL.
  */
-FILE *
+fetchIO *
 fetchGet(struct url *URL, const char *flags)
 {
 	return (fetchXGet(URL, NULL, flags));
@@ -105,7 +105,7 @@ fetchGet(struct url *URL, const char *fl
  * Select the appropriate protocol for the URL scheme, and return a
  * write-only stream connected to the document referenced by the URL.
  */
-FILE *
+fetchIO *
 fetchPut(struct url *URL, const char *flags)
 {
 	int direct;
@@ -174,11 +174,11 @@ fetchList(struct url *URL, const char *f
 /*
  * Attempt to parse the given URL; if successful, call fetchXGet().
  */
-FILE *
+fetchIO *
 fetchXGetURL(const char *URL, struct url_stat *us, const char *flags)
 {
 	struct url *u;
-	FILE *f;
+	fetchIO *f;
 
 	if ((u = fetchParseURL(URL)) == NULL)
 		return (NULL);
@@ -192,7 +192,7 @@ fetchXGetURL(const char *URL, struct url
 /*
  * Attempt to parse the given URL; if successful, call fetchGet().
  */
-FILE *
+fetchIO *
 fetchGetURL(const char *URL, const char *flags)
 {
 	return (fetchXGetURL(URL, NULL, flags));
@@ -201,11 +201,11 @@ fetchGetURL(const char *URL, const char 
 /*
  * Attempt to parse the given URL; if successful, call fetchPut().
  */
-FILE *
+fetchIO *
 fetchPutURL(const char *URL, const char *flags)
 {
 	struct url *u;
-	FILE *f;
+	fetchIO *f;
 
 	if ((u = fetchParseURL(URL)) == NULL)
 		return (NULL);
@@ -408,16 +408,6 @@ nohost:
 		goto ouch;
 	}
 
-	DEBUG(fprintf(stderr,
-		  "scheme:   [%s]\n"
-		  "user:     [%s]\n"
-		  "password: [%s]\n"
-		  "host:     [%s]\n"
-		  "port:     [%d]\n"
-		  "document: [%s]\n",
-		  u->scheme, u->user, u->pwd,
-		  u->host, u->port, u->doc));
-
 	return (u);
 
 ouch: