summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2005-04-17 14:42:52 +0000
committerume <ume@FreeBSD.org>2005-04-17 14:42:52 +0000
commit04a684b00867c82cd1b39dd8ee860493675f6cb0 (patch)
treef7b5fffce7297b406c3e93a9f7dfe8f7789c0cc9
parent2cb9485db2caace1a0b1530fafc8adeb76777620 (diff)
downloadFreeBSD-src-04a684b00867c82cd1b39dd8ee860493675f6cb0.zip
FreeBSD-src-04a684b00867c82cd1b39dd8ee860493675f6cb0.tar.gz
libc-internal interfaces should have two underscores in front
of their names. Pointed out by: das
-rw-r--r--lib/libc/net/getservbyname.c2
-rw-r--r--lib/libc/net/getservbyport.c2
-rw-r--r--lib/libc/net/getservent.c8
-rw-r--r--lib/libc/net/netdb_private.h12
4 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
index 5724d99..bdbfc01 100644
--- a/lib/libc/net/getservbyname.c
+++ b/lib/libc/net/getservbyname.c
@@ -81,7 +81,7 @@ getservbyname(const char *name, const char *proto)
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0)
return (NULL);
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
index cb4bc10..c70af6d 100644
--- a/lib/libc/net/getservbyport.c
+++ b/lib/libc/net/getservbyport.c
@@ -75,7 +75,7 @@ getservbyport(int port, const char *proto)
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0)
return (NULL);
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index e177256..26c2e28 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -91,7 +91,7 @@ servdata_keycreate(void)
}
struct servdata *
-_servdata_init(void)
+__servdata_init(void)
{
struct servdata *sd;
@@ -326,7 +326,7 @@ setservent(int f)
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return;
setservent_r(f, &sd->data);
}
@@ -336,7 +336,7 @@ endservent(void)
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return;
endservent_r(&sd->data);
}
@@ -346,7 +346,7 @@ getservent(void)
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservent_r(&sd->serv, &sd->data) != 0)
return (NULL);
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index 3795b3a..3ee70fb 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -53,13 +53,13 @@ struct servdata {
struct servent_data data;
};
-#define endservent_r _endservent_r
-#define getservbyname_r _getservbyname_r
-#define getservbyport_r _getservbyport_r
-#define getservent_r _getservent_r
-#define setservent_r _setservent_r
+#define endservent_r __endservent_r
+#define getservbyname_r __getservbyname_r
+#define getservbyport_r __getservbyport_r
+#define getservent_r __getservent_r
+#define setservent_r __setservent_r
-struct servdata *_servdata_init(void);
+struct servdata *__servdata_init(void);
void endservent_r(struct servent_data *);
int getservbyname_r(const char *, const char *, struct servent *,
struct servent_data *);
OpenPOWER on IntegriCloud