diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-18 12:16:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-18 16:44:59 +0100 |
| commit | 5c73dabd49bfca840c062e8c49d8765dc0e4531e (patch) | |
| tree | 481917c0100432b1f49129ed20cfa5760b284a16 /source3/lib/replace/replace.c | |
| parent | a4d7cbcb2f9af300b005457867903387fb61a532 (diff) | |
| download | samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.tar.gz samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.tar.bz2 samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.zip | |
libreplace: replace inet_ntoa() when it is missing
...not only replace it when it is broken.
This moves the defintion of rep_inet_ntoa from replace.c
to inet_ntoa.c and adds configure checks for existence
of inet_ntoa(). Checks are moved to an include file of its own.
NOTE: The original rep_inet_ntoa in replace.c was wrapped
into a "#ifndef WITH_PTHREADS" but the prototype in replace.h
and the define in system/network.h were not. I removed that
ifndef since the inet_ntoa() function is usually not thread safe
anyways, since it returns a pointer to a static buffer.
So whoever calls inet_ntoa() should be aware that it is not
thread safe anyways.
Michael
(cherry picked from commit 974c0c45ad42644348e0b55454715b12158f1028)
(This used to be commit edcf2712bcdedabbfdd9ee8b9a18f46126930636)
Diffstat (limited to 'source3/lib/replace/replace.c')
| -rw-r--r-- | source3/lib/replace/replace.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/source3/lib/replace/replace.c b/source3/lib/replace/replace.c index b2a240e8ab..c16bded963 100644 --- a/source3/lib/replace/replace.c +++ b/source3/lib/replace/replace.c @@ -295,20 +295,6 @@ char *rep_strdup(const char *s) } #endif /* HAVE_STRDUP */ -#ifndef WITH_PTHREADS -/* REWRITE: not thread safe */ -#ifdef REPLACE_INET_NTOA -char *rep_inet_ntoa(struct in_addr ip) -{ - uint8_t *p = (uint8_t *)&ip.s_addr; - static char buf[18]; - slprintf(buf, 17, "%d.%d.%d.%d", - (int)p[0], (int)p[1], (int)p[2], (int)p[3]); - return buf; -} -#endif /* REPLACE_INET_NTOA */ -#endif - #ifndef HAVE_SETLINEBUF void rep_setlinebuf(FILE *stream) { |