diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-08-21 11:04:21 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-08-21 11:04:21 +0000 |
commit | 96c337af8c1b79911fe0268db9337970f794094c (patch) | |
tree | 5a73a02c5ed3b076e2866cdcb708079df0d10074 /lib/server/SocketStream.cpp | |
parent | d68ebb825e12bf7e3a99be456f0e02e5e374b7e3 (diff) |
Make Open() take a const std::string& for the socket name instead of a
const char *, for C++ style.
Diffstat (limited to 'lib/server/SocketStream.cpp')
-rw-r--r-- | lib/server/SocketStream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/server/SocketStream.cpp b/lib/server/SocketStream.cpp index 7faff8c3..a6f99dad 100644 --- a/lib/server/SocketStream.cpp +++ b/lib/server/SocketStream.cpp @@ -136,7 +136,7 @@ void SocketStream::Attach(int socket) // Created: 2003/07/31 // // -------------------------------------------------------------------------- -void SocketStream::Open(int Type, const char *Name, int Port) +void SocketStream::Open(int Type, const std::string& rName, int Port) { if(mSocketHandle != INVALID_SOCKET_VALUE) { @@ -147,7 +147,7 @@ void SocketStream::Open(int Type, const char *Name, int Port) int sockDomain = 0; SocketAllAddr addr; int addrLen = 0; - Socket::NameLookupToSockAddr(addr, sockDomain, Type, Name, Port, addrLen); + Socket::NameLookupToSockAddr(addr, sockDomain, Type, rName, Port, addrLen); // Create the socket mSocketHandle = ::socket(sockDomain, SOCK_STREAM, @@ -166,11 +166,11 @@ void SocketStream::Open(int Type, const char *Name, int Port) DWORD err = WSAGetLastError(); ::closesocket(mSocketHandle); BOX_LOG_WIN_ERROR_NUMBER("Failed to connect to socket " - "(type " << Type << ", name " << Name << + "(type " << Type << ", name " << rName << ", port " << Port << ")", err); #else // !WIN32 BOX_LOG_SYS_ERROR("Failed to connect to socket (type " << - Type << ", name " << Name << ", port " << Port << + Type << ", name " << rName << ", port " << Port << ")"); ::close(mSocketHandle); #endif // WIN32 |