mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4416) Remove a pointless buffer copy and use strlcpy() instead of snprintf("%s")

release/0.5
tron 2006-04-14 18:52:08 +00:00
parent 4118b66322
commit c9580160b2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
network_udp.c
View File

@ -549,15 +549,12 @@ NetworkGameList *NetworkUDPQueryServer(const char* host, unsigned short port)
struct sockaddr_in out_addr; struct sockaddr_in out_addr;
Packet *p; Packet *p;
NetworkGameList *item; NetworkGameList *item;
char hostname[NETWORK_HOSTNAME_LENGTH];
// No UDP-socket yet.. // No UDP-socket yet..
if (_udp_client_socket == INVALID_SOCKET) if (_udp_client_socket == INVALID_SOCKET)
if (!NetworkUDPListen(&_udp_client_socket, 0, 0, true)) if (!NetworkUDPListen(&_udp_client_socket, 0, 0, true))
return NULL; return NULL;
ttd_strlcpy(hostname, host, sizeof(hostname));
out_addr.sin_family = AF_INET; out_addr.sin_family = AF_INET;
out_addr.sin_port = htons(port); out_addr.sin_port = htons(port);
out_addr.sin_addr.s_addr = NetworkResolveHost(host); out_addr.sin_addr.s_addr = NetworkResolveHost(host);
@ -565,8 +562,8 @@ NetworkGameList *NetworkUDPQueryServer(const char* host, unsigned short port)
// Clear item in gamelist // Clear item in gamelist
item = NetworkGameListAddItem(inet_addr(inet_ntoa(out_addr.sin_addr)), ntohs(out_addr.sin_port)); item = NetworkGameListAddItem(inet_addr(inet_ntoa(out_addr.sin_addr)), ntohs(out_addr.sin_port));
memset(&item->info, 0, sizeof(item->info)); memset(&item->info, 0, sizeof(item->info));
snprintf(item->info.server_name, sizeof(item->info.server_name), "%s", hostname); ttd_strlcpy(item->info.server_name, host, lengthof(item->info.server_name));
snprintf(item->info.hostname, sizeof(item->info.hostname), "%s", hostname); ttd_strlcpy(item->info.hostname, host, lengthof(item->info.hostname));
item->online = false; item->online = false;
// Init the packet // Init the packet