cpp/openttd-patchpack/source Changeset - r25306:4072787de05b

Changeset - r25306:4072787de05b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 3 years ago 2021-04-29 10:05:43
truebrain@openttd.org

Codechange: use std::string over stack-based strings if possible

2 files changed with 17 insertions and 20 deletions:

src/network/core/address.cpp

src/network/network_gui.cpp

0 comments (0 inline, 0 general)

src/network/core/address.cpp

➞

Show inline comments

@@ @@ -310,14 +310,13 @@ SOCKET NetworkAddress::Resolve(int famil @@
  * @return the opened socket or INVALID_SOCKET
  */
 static SOCKET ConnectLoopProc(addrinfo *runp)
+{
 	const char *type = NetworkAddress::SocketTypeAsString(runp->ai_socktype);
 	const char *family = NetworkAddress::AddressFamilyAsString(runp->ai_family);
 	char address[NETWORK_HOSTNAME_LENGTH + 6 + 7];
 	NetworkAddress(runp->ai_addr, (int)runp->ai_addrlen).GetAddressAsString(address, lastof(address));
 	std::string address = NetworkAddress(runp->ai_addr, (int)runp->ai_addrlen).GetAddressAsString();
 	SOCKET sock = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
 	if (sock == INVALID_SOCKET) {
 		DEBUG(net, 1, "[%s] could not create %s socket: %s", type, family, NetworkGetLastErrorString());
 		return INVALID_SOCKET;
+	}
@@ @@ -325,13 +324,13 @@ static SOCKET ConnectLoopProc(addrinfo * @@
 	if (!SetNoDelay(sock)) DEBUG(net, 1, "[%s] setting TCP_NODELAY failed", type);
 	if (!SetNonBlocking(sock)) DEBUG(net, 0, "[%s] setting non-blocking mode failed", type);
 	int err = connect(sock, runp->ai_addr, (int)runp->ai_addrlen);
 	if (err != 0 && NetworkGetLastError() != EINPROGRESS) {
 		DEBUG(net, 1, "[%s] could not connect to %s over %s: %s", type, address, family, NetworkGetLastErrorString());
+		DEBUG(net, 1, "[%s] could not connect to %s over %s: %s", type, address.c_str(), family, NetworkGetLastErrorString());
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	fd_set write_fd;
 	struct timeval tv;
@@ @@ -341,34 +340,34 @@ static SOCKET ConnectLoopProc(addrinfo * @@
 	/* Wait for connect() to either connect, timeout or fail. */
 	tv.tv_usec = 0;
 	tv.tv_sec = DEFAULT_CONNECT_TIMEOUT_SECONDS;
 	int n = select(FD_SETSIZE, NULL, &write_fd, NULL, &tv);
 	if (n < 0) {
 		DEBUG(net, 1, "[%s] could not connect to %s: %s", type, address, NetworkGetLastErrorString());
+		DEBUG(net, 1, "[%s] could not connect to %s: %s", type, address.c_str(), NetworkGetLastErrorString());
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	/* If no fd is selected, the timeout has been reached. */
 	if (n == 0) {
 		DEBUG(net, 1, "[%s] timed out while connecting to %s", type, address);
+		DEBUG(net, 1, "[%s] timed out while connecting to %s", type, address.c_str());
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	/* Retrieve last error, if any, on the socket. */
 	err = GetSocketError(sock);
 	if (err != 0) {
 		DEBUG(net, 1, "[%s] could not connect to %s: %s", type, address, NetworkGetErrorString(err));
+		DEBUG(net, 1, "[%s] could not connect to %s: %s", type, address.c_str(), NetworkGetErrorString(err));
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	/* Connection succeeded. */
 	DEBUG(net, 1, "[%s] connected to %s", type, address);
+	DEBUG(net, 1, "[%s] connected to %s", type, address.c_str());
 	return sock;
+}
 /**
  * Connect to the given address.
@@ @@ -387,54 +386,53 @@ SOCKET NetworkAddress::Connect() @@
  * @return the opened socket or INVALID_SOCKET
  */
 static SOCKET ListenLoopProc(addrinfo *runp)
+{
 	const char *type = NetworkAddress::SocketTypeAsString(runp->ai_socktype);
 	const char *family = NetworkAddress::AddressFamilyAsString(runp->ai_family);
 	char address[NETWORK_HOSTNAME_LENGTH + 6 + 7];
 	NetworkAddress(runp->ai_addr, (int)runp->ai_addrlen).GetAddressAsString(address, lastof(address));
 	std::string address = NetworkAddress(runp->ai_addr, (int)runp->ai_addrlen).GetAddressAsString();
 	SOCKET sock = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
 	if (sock == INVALID_SOCKET) {
 		DEBUG(net, 0, "[%s] could not create %s socket on port %s: %s", type, family, address, NetworkGetLastErrorString());
+		DEBUG(net, 0, "[%s] could not create %s socket on port %s: %s", type, family, address.c_str(), NetworkGetLastErrorString());
 		return INVALID_SOCKET;
+	}
 	if (runp->ai_socktype == SOCK_STREAM && !SetNoDelay(sock)) {
 		DEBUG(net, 3, "[%s] setting TCP_NODELAY failed for port %s", type, address);
+		DEBUG(net, 3, "[%s] setting TCP_NODELAY failed for port %s", type, address.c_str());
+	}
 	int on = 1;
 	/* The (const char*) cast is needed for windows!! */
 	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)) == -1) {
 		DEBUG(net, 3, "[%s] could not set reusable %s sockets for port %s: %s", type, family, address, NetworkGetLastErrorString());
+		DEBUG(net, 3, "[%s] could not set reusable %s sockets for port %s: %s", type, family, address.c_str(), NetworkGetLastErrorString());
+	}
 #ifndef __OS2__
 	if (runp->ai_family == AF_INET6 &&
 			setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&on, sizeof(on)) == -1) {
 		DEBUG(net, 3, "[%s] could not disable IPv4 over IPv6 on port %s: %s", type, address, NetworkGetLastErrorString());
+		DEBUG(net, 3, "[%s] could not disable IPv4 over IPv6 on port %s: %s", type, address.c_str(), NetworkGetLastErrorString());
+	}
 #endif
 	if (bind(sock, runp->ai_addr, (int)runp->ai_addrlen) != 0) {
 		DEBUG(net, 1, "[%s] could not bind on %s port %s: %s", type, family, address, NetworkGetLastErrorString());
+		DEBUG(net, 1, "[%s] could not bind on %s port %s: %s", type, family, address.c_str(), NetworkGetLastErrorString());
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	if (runp->ai_socktype != SOCK_DGRAM && listen(sock, 1) != 0) {
 		DEBUG(net, 1, "[%s] could not listen at %s port %s: %s", type, family, address, NetworkGetLastErrorString());
+		DEBUG(net, 1, "[%s] could not listen at %s port %s: %s", type, family, address.c_str(), NetworkGetLastErrorString());
 		closesocket(sock);
 		return INVALID_SOCKET;
+	}
 	/* Connection succeeded */
 	if (!SetNonBlocking(sock)) DEBUG(net, 0, "[%s] setting non-blocking mode failed for %s port %s", type, family, address);
+	if (!SetNonBlocking(sock)) DEBUG(net, 0, "[%s] setting non-blocking mode failed for %s port %s", type, family, address.c_str());
 	DEBUG(net, 1, "[%s] listening on %s port %s", type, family, address);
+	DEBUG(net, 1, "[%s] listening on %s port %s", type, family, address.c_str());
 	return sock;
+}
 /**
  * Make the given socket listen.
  * @param socktype the type of socket (TCP, UDP, etc)

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -642,15 +642,14 @@ public: @@
 			y += FONT_HEIGHT_NORMAL;
 			SetDParamStr(0, sel->info.server_revision);
 			DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_SERVER_VERSION); // server version
 			y += FONT_HEIGHT_NORMAL;
 			char network_addr_buffer[NETWORK_HOSTNAME_LENGTH + 6 + 7];
 			sel->address.GetAddressAsString(network_addr_buffer, lastof(network_addr_buffer));
 			SetDParamStr(0, network_addr_buffer);
 			std::string address = sel->address.GetAddressAsString();
 			SetDParamStr(0, address.c_str());
 			DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_SERVER_ADDRESS); // server address
 			y += FONT_HEIGHT_NORMAL;
 			SetDParam(0, sel->info.start_date);
 			DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_START_DATE); // start date
 			y += FONT_HEIGHT_NORMAL;

0 comments (0 inline, 0 general)