diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 11:01:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 11:01:08 +0200 |
| commit | 1908bae50491624d270c73609ea45634c15246fd (patch) | |
| tree | 791c0e718c8af6f3214c51225176a8509eb7c043 | |
| parent | 0191f6b8a8c629f9d84efdb607b6971dc8323707 (diff) | |
| download | rsyslog-1908bae50491624d270c73609ea45634c15246fd.tar.gz rsyslog-1908bae50491624d270c73609ea45634c15246fd.tar.xz rsyslog-1908bae50491624d270c73609ea45634c15246fd.zip | |
fixed git merge bug (duplicate code could not be detected)
| -rw-r--r-- | runtime/net.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/runtime/net.c b/runtime/net.c index 38b41389..44c9008a 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -695,25 +695,6 @@ finalize_it: } - -/* This is a synchronized getnameinfo() version, because we learned - * (via drd/valgrind) that getnameinfo() seems to have some multi-threading - * issues. -- rgerhards, 2008-09-30 - */ -static int -mygetnameinfo(const struct sockaddr *sa, socklen_t salen, - char *host, size_t hostlen, - char *serv, size_t servlen, int flags) -{ - int iCancelStateSave; - int i; - - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); - i = getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); - pthread_setcancelstate(iCancelStateSave, NULL); - return i; -} - /* Print an allowed sender list. The caller must tell us which one. * iListToPrint = 1 means UDP, 2 means TCP * rgerhards, 2005-09-27 |