oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

net/StaticSocketAddress: replace cast operator with GetAddress()

Browse Source 
The implicit cast operator can be very dangerous.
This commit is contained in:
Max Kellermann 2015-07-22 10:55:35 +02:00
parent 3441ea9844
commit 7de0a621e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event/ServerSocket.cxx
View File

@ -159,7 +159,7 @@ OneServerSocket::Accept()
StaticSocketAddress peer_address; StaticSocketAddress peer_address;
size_t peer_address_length = sizeof(peer_address); size_t peer_address_length = sizeof(peer_address);
int peer_fd = int peer_fd =
accept_cloexec_nonblock(Get(), peer_address, accept_cloexec_nonblock(Get(), peer_address.GetAddress(),
&peer_address_length); &peer_address_length);
if (peer_fd < 0) { if (peer_fd < 0) {
const SocketErrorMessage msg; const SocketErrorMessage msg;
@ -306,7 +306,7 @@ ServerSocket::AddFD(int fd, Error &error)
StaticSocketAddress address; StaticSocketAddress address;
socklen_t address_length = sizeof(address); socklen_t address_length = sizeof(address);
if (getsockname(fd, address, if (getsockname(fd, address.GetAddress(),
&address_length) < 0) { &address_length) < 0) {
SetSocketError(error); SetSocketError(error);
error.AddPrefix("Failed to get socket address: "); error.AddPrefix("Failed to get socket address: ");

4
src/net/StaticSocketAddress.hxx
View File

@ -56,11 +56,11 @@ public:
size); size);
} }
operator struct sockaddr *() { struct sockaddr *GetAddress() {
return reinterpret_cast<struct sockaddr *>(&address); return reinterpret_cast<struct sockaddr *>(&address);
} }
operator const struct sockaddr *() const { const struct sockaddr *GetAddress() const {
return reinterpret_cast<const struct sockaddr *>(&address); return reinterpret_cast<const struct sockaddr *>(&address);
} }