2 files changed, 13 insertions, 17 deletions

diff --git a/src/lib/libc/net/getservbyname.c b/src/lib/libc/net/getservbyname.c
index f1c312ea82..c5f42a7b9c 100644
--- a/src/lib/libc/net/getservbyname.c
+++ b/src/lib/libc/net/getservbyname.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.6 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.7 2004/09/16 03:16:50 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
@@ -40,14 +40,11 @@ extern int _serv_stayopen;
 _THREAD_PRIVATE_MUTEX(getservbyname_r);
 
 struct servent *
-getservbyname_r(name, proto, se, buf, buflen)
-        const char *name, *proto;
-        struct servent *se;
-        char *buf;
-        int buflen;
+getservbyname_r(const char *name, const char *proto, struct servent *se,
+    char *buf, int buflen)
 {
-        register struct servent *p;
-        register char **cp;
+        struct servent *p;
+        char **cp;
 
         _THREAD_PRIVATE_MUTEX_LOCK(getservbyname_r);
         setservent(_serv_stayopen);
@@ -68,8 +65,8 @@ gotname:
         return (p);
 }
 
-struct servent *getservbyname(name, proto)
-        const char *name, *proto;
+struct servent *
+getservbyname(const char *name, const char *proto)
 {
         _THREAD_PRIVATE_KEY(getservbyname);
         static char buf[4096];
@@ -78,6 +75,6 @@ struct servent *getservbyname(name, proto)
         if (bufp == NULL)
                 return (NULL);
         return getservbyname_r(name, proto, (struct servent*) bufp, 
-                bufp + sizeof(struct servent), 
-                sizeof buf - sizeof(struct servent) );
+            bufp + sizeof(struct servent), 
+            sizeof buf - sizeof(struct servent) );
 }
diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
index bad3316f6c..475e25a1f8 100644
--- a/src/lib/libc/net/getservent.c
+++ b/src/lib/libc/net/getservent.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservent.c,v 1.6 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: getservent.c,v 1.7 2004/09/16 03:13:22 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -47,8 +47,7 @@ static char *serv_aliases[MAXALIASES];
 int _serv_stayopen;
 
 void
-setservent(f)
-        int f;
+setservent(int f)
 {
         if (servf == NULL)
                 servf = fopen(_PATH_SERVICES, "r" );
@@ -58,7 +57,7 @@ setservent(f)
 }
 
 void
-endservent()
+endservent(void)
 {
         if (servf) {
                 fclose(servf);
@@ -68,7 +67,7 @@ endservent()
 }
 
 struct servent *
-getservent()
+getservent(void)
 {
         char *p, *cp, **q, *endp;
         long l;