summaryrefslogtreecommitdiff
path: root/src/lib/libc/net/getservbyname.c
diff options
context:
space:
mode:
authorderaadt <>2004-09-16 03:16:50 +0000
committerderaadt <>2004-09-16 03:16:50 +0000
commitae87b0a7f6594b8bdaa47691da301cdac965f0c7 (patch)
treeb65f3a91f26ad3b336ff7e0c8f9d0208f0b55c20 /src/lib/libc/net/getservbyname.c
parent81b9e8855e523dbef4294e04d7598d296b2dd526 (diff)
downloadopenbsd-ae87b0a7f6594b8bdaa47691da301cdac965f0c7.tar.gz
openbsd-ae87b0a7f6594b8bdaa47691da301cdac965f0c7.tar.bz2
openbsd-ae87b0a7f6594b8bdaa47691da301cdac965f0c7.zip
ansi
Diffstat (limited to 'src/lib/libc/net/getservbyname.c')
-rw-r--r--src/lib/libc/net/getservbyname.c21
1 files changed, 9 insertions, 12 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 @@
28 */ 28 */
29 29
30#if defined(LIBC_SCCS) && !defined(lint) 30#if defined(LIBC_SCCS) && !defined(lint)
31static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.6 2003/06/02 20:18:35 millert Exp $"; 31static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.7 2004/09/16 03:16:50 deraadt Exp $";
32#endif /* LIBC_SCCS and not lint */ 32#endif /* LIBC_SCCS and not lint */
33 33
34#include <netdb.h> 34#include <netdb.h>
@@ -40,14 +40,11 @@ extern int _serv_stayopen;
40_THREAD_PRIVATE_MUTEX(getservbyname_r); 40_THREAD_PRIVATE_MUTEX(getservbyname_r);
41 41
42struct servent * 42struct servent *
43getservbyname_r(name, proto, se, buf, buflen) 43getservbyname_r(const char *name, const char *proto, struct servent *se,
44 const char *name, *proto; 44 char *buf, int buflen)
45 struct servent *se;
46 char *buf;
47 int buflen;
48{ 45{
49 register struct servent *p; 46 struct servent *p;
50 register char **cp; 47 char **cp;
51 48
52 _THREAD_PRIVATE_MUTEX_LOCK(getservbyname_r); 49 _THREAD_PRIVATE_MUTEX_LOCK(getservbyname_r);
53 setservent(_serv_stayopen); 50 setservent(_serv_stayopen);
@@ -68,8 +65,8 @@ gotname:
68 return (p); 65 return (p);
69} 66}
70 67
71struct servent *getservbyname(name, proto) 68struct servent *
72 const char *name, *proto; 69getservbyname(const char *name, const char *proto)
73{ 70{
74 _THREAD_PRIVATE_KEY(getservbyname); 71 _THREAD_PRIVATE_KEY(getservbyname);
75 static char buf[4096]; 72 static char buf[4096];
@@ -78,6 +75,6 @@ struct servent *getservbyname(name, proto)
78 if (bufp == NULL) 75 if (bufp == NULL)
79 return (NULL); 76 return (NULL);
80 return getservbyname_r(name, proto, (struct servent*) bufp, 77 return getservbyname_r(name, proto, (struct servent*) bufp,
81 bufp + sizeof(struct servent), 78 bufp + sizeof(struct servent),
82 sizeof buf - sizeof(struct servent) ); 79 sizeof buf - sizeof(struct servent) );
83} 80}