From f2f8fae58bce822b0fbcca8fb7e27b2218edcb64 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Wed, 5 Apr 2023 11:16:25 -0500 Subject: [PATCH] [Telnet] Telnet encoding fix (#3269) --- common/net/tcp_connection.cpp | 2 +- world/clientlist.cpp | 4 ++-- world/zonelist.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/net/tcp_connection.cpp b/common/net/tcp_connection.cpp index 372442c7d..0c2512dcc 100644 --- a/common/net/tcp_connection.cpp +++ b/common/net/tcp_connection.cpp @@ -142,7 +142,7 @@ void EQ::Net::TCPConnection::Write(const char *data, size_t count) WriteBaton *baton = new WriteBaton; baton->connection = this; - baton->buffer = new char[count];; + baton->buffer = new char[count]; uv_write_t *write_req = new uv_write_t; memset(write_req, 0, sizeof(uv_write_t)); diff --git a/world/clientlist.cpp b/world/clientlist.cpp index 225069e9b..57b2c8f98 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -268,8 +268,8 @@ void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnect strcpy(newline, "\r\n"); else strcpy(newline, "^"); - std::vector out; + auto out = fmt::memory_buffer(); iterator.Reset(); while(iterator.MoreElements()) { ClientListEntry* cle = iterator.GetData(); @@ -1008,7 +1008,7 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct* if (whom) whomlen = strlen(whom->whom); - std::vector out; + auto out = fmt::memory_buffer(); fmt::format_to(std::back_inserter(out), "Players on server:"); if (connection->IsConsole()) fmt::format_to(std::back_inserter(out), "\r\n"); diff --git a/world/zonelist.cpp b/world/zonelist.cpp index 701fc2400..c2db3676e 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -311,7 +311,7 @@ void ZSList::SendZoneStatus(const char* to, int16 admin, WorldTCPConnection* con strcpy(locked, "No"); } - std::vector out; + auto out = fmt::memory_buffer(); if (connection->IsConsole()) { fmt::format_to(std::back_inserter(out), "World Locked: {}\r\n", locked);