aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/ClientNew.cxx2
-rw-r--r--src/event/ServerSocket.cxx2
-rw-r--r--src/net/ToString.cxx2
-rw-r--r--src/net/ToString.hxx2
-rw-r--r--src/output/plugins/httpd/HttpdOutputPlugin.cxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/client/ClientNew.cxx b/src/client/ClientNew.cxx
index 8e5c9fc36..90c81f2c6 100644
--- a/src/client/ClientNew.cxx
+++ b/src/client/ClientNew.cxx
@@ -62,7 +62,7 @@ client_new(EventLoop &loop, Partition &partition,
int fd, SocketAddress address, int uid)
{
static unsigned int next_client_num;
- const auto remote = sockaddr_to_string(address);
+ const auto remote = ToString(address);
assert(fd >= 0);
diff --git a/src/event/ServerSocket.cxx b/src/event/ServerSocket.cxx
index c963e79dc..69e62f897 100644
--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -112,7 +112,7 @@ public:
gcc_pure
std::string ToString() const {
- return sockaddr_to_string(address);
+ return ::ToString(address);
}
void SetFD(int _fd) {
diff --git a/src/net/ToString.cxx b/src/net/ToString.cxx
index 860820003..579e2ddcb 100644
--- a/src/net/ToString.cxx
+++ b/src/net/ToString.cxx
@@ -102,7 +102,7 @@ UnmapV4(SocketAddress src, struct sockaddr_in &buffer)
#endif
std::string
-sockaddr_to_string(SocketAddress address)
+ToString(SocketAddress address)
{
#ifdef HAVE_UN
if (address.GetFamily() == AF_UNIX)
diff --git a/src/net/ToString.hxx b/src/net/ToString.hxx
index 8027e5267..bc41a8525 100644
--- a/src/net/ToString.hxx
+++ b/src/net/ToString.hxx
@@ -33,6 +33,6 @@ class SocketAddress;
*/
gcc_pure
std::string
-sockaddr_to_string(SocketAddress address);
+ToString(SocketAddress address);
#endif
diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
index 3ed395e63..d13f646f3 100644
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -209,7 +209,7 @@ HttpdOutput::OnAccept(int fd, SocketAddress address, gcc_unused int uid)
#ifdef HAVE_LIBWRAP
if (address.GetFamily() != AF_UNIX) {
- const auto hostaddr = sockaddr_to_string(address);
+ const auto hostaddr = ToString(address);
// TODO: shall we obtain the program name from argv[0]?
const char *progname = "mpd";