From 17d0495c338ca6273cc1e1e3fd9354ab785a9ae9 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 9 May 2000 02:21:58 +0000
Subject: [PATCH]  160.   [cleanup]       getnet*() are not going to be
 implemented at this 			 stage.

---
 CHANGES                            |  3 +
 lib/lwres/getnet.c                 | 93 ------------------------------
 lib/lwres/include/lwres/netdb.h.in |  8 +--
 3 files changed, 7 insertions(+), 97 deletions(-)
 delete mode 100644 lib/lwres/getnet.c

diff --git a/CHANGES b/CHANGES
index 52ad498742..c0e716e052 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 160.	[cleanup]	getnet*() are not going to be implemented at this
+			stage.
+
  159.	[func]		Redefinition of config file elements is now an
 			error (instead of a warning).
 
diff --git a/lib/lwres/getnet.c b/lib/lwres/getnet.c
deleted file mode 100644
index 29ffc86309..0000000000
--- a/lib/lwres/getnet.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2000  Internet Software Consortium.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stdio.h>
-
-#include <lwres/netdb.h>
-
-#include "assert_p.h"
-
-struct netent *
-lwres_getnetbyname(const char *name) {
-
-	/* XXX */
-	UNUSED(name);
-	return (NULL);
-}
-
-struct netent *
-lwres_getnetbyaddr(unsigned long net, int type) {
-
-	if (type == AF_INET) 
-		return (NULL);
-
-	/* XXX */
-	UNUSED(net);
-	return (NULL);
-}
-
-struct netent *
-lwres_getnetent() {
-
-	return (NULL);
-}
-
-void
-lwres_setnetent(int stayopen) {
-	
-	UNUSED(stayopen);
-	/* empty */
-}
-
-void
-lwres_endnetent() {
-	/* empty */
-}
-
-struct netent *
-lwres_getnetbyname_r(const char *name, struct netent *resbuf, char *buf,
-	       int buflen)
-{
-	return (NULL);
-}
-
-struct netent *
-lwres_getnetbyaddr_r(long addr, int type, struct netent *resbuf, char *buf,
-	       int buflen)
-{
-	return (NULL);
-}
-
-struct netent *
-lwres_getnetent_r(struct netent *resbuf, char *buf, int buflen) {
-	return (NULL);
-}
-
-void
-lwres_setnetent_r(int stayopen) {
-	(void)stayopen;
-}
-
-void
-lwres_endnetent_r(void) {
-	/* empty */
-}
diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index ae3f0a4b97..042adcbbb0 100644
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -286,7 +286,6 @@ struct	addrinfo {
 #define getprotoent_r lwres_getprotoent_r
 #define setprotoent_r lwres_setprotoent_r
 #define endprotoent_r lwres_endprotoent_r
-#endif
 
 #ifdef getnetbyname
 #undef getnetbyname
@@ -338,13 +337,14 @@ struct	addrinfo {
 #undef endnetent_r
 #endif
 #define endnetent_r lwres_endnetent_r
+#endif	/* notyet */
 
 #ifdef h_errno
 #undef h_errno
 #endif
 #define h_errno lwres_h_errno
 
-#endif
+#endif	/* LWRES_NAMESPACE */
 
 LWRES_LANG_BEGINDECLS
 
@@ -368,13 +368,13 @@ void		lwres_sethostent(int);
 /* void		lwres_sethostfile(const char *); */
 void		lwres_freehostent(struct hostent *);
 
+#ifdef notyet
 struct netent	*lwres_getnetbyaddr(unsigned long, int);
 struct netent	*lwres_getnetbyname(const char *);
 struct netent	*lwres_getnetent(void);
 void		lwres_endnetent(void);
 void		lwres_setnetent(int);
 
-#ifdef notyet
 struct protoent	*lwres_getprotobyname(const char *);
 struct protoent	*lwres_getprotobynumber(int);
 struct protoent	*lwres_getprotoent(void);
@@ -401,6 +401,7 @@ struct hostent	*lwres_gethostent_r(struct hostent *, char *, int, int *);
 void		lwres_sethostent_r(int);
 void		lwres_endhostent_r(void);
 
+#ifdef notyet
 struct netent	*lwres_getnetbyname_r(const char *, struct netent *,
 					char *, int);
 struct netent	*lwres_getnetbyaddr_r(long, int, struct netent *,
@@ -409,7 +410,6 @@ struct netent	*lwres_getnetent_r(struct netent *, char *, int);
 void		lwres_setnetent_r(int);
 void		lwres_endnetent_r(void);
 
-#ifdef notyet
 struct protoent	*lwres_getprotobyname_r(const char *,
 				struct protoent *, char *, int);
 struct protoent	*lwres_getprotobynumber_r(int,