diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-12-09 17:45:40 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-12-09 17:51:21 +0100 |
| commit | 6f4c380d95429ef4615f0a9f40d6fec9e1469764 (patch) | |
| tree | 545bbb6260bcbf427e48e98fd6bbebb989bf0590 /Servers/TelnetServer | |
| parent | 1726c17d0d4325f11124e270ae1658110af606d0 (diff) | |
| download | serenity-6f4c380d95429ef4615f0a9f40d6fec9e1469764.zip | |
AK: Use size_t for the length of strings
Using int was a mistake. This patch changes String, StringImpl,
StringView and StringBuilder to use size_t instead of int for lengths.
Obviously a lot of code needs to change as a result of this.
Diffstat (limited to 'Servers/TelnetServer')
| -rw-r--r-- | Servers/TelnetServer/Client.cpp | 11 | ||||
| -rw-r--r-- | Servers/TelnetServer/Parser.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Servers/TelnetServer/Client.cpp b/Servers/TelnetServer/Client.cpp index 76d476113b..459c8c1029 100644 --- a/Servers/TelnetServer/Client.cpp +++ b/Servers/TelnetServer/Client.cpp @@ -1,3 +1,4 @@ +#include "Client.h" #include <AK/BufferStream.h> #include <AK/ByteBuffer.h> #include <AK/String.h> @@ -7,8 +8,7 @@ #include <LibCore/CNotifier.h> #include <LibCore/CTCPSocket.h> #include <stdio.h> - -#include "Client.h" +#include <unistd.h> Client::Client(int id, RefPtr<CTCPSocket> socket, int ptm_fd) : m_id(id) @@ -56,7 +56,7 @@ void Client::drain_pty() quit(); return; } - send_data(StringView(buffer, nread)); + send_data(StringView(buffer, (size_t)nread)); } void Client::handle_data(const StringView& data) @@ -105,7 +105,7 @@ void Client::handle_error() void Client::send_data(StringView data) { bool fast = true; - for (int i = 0; i < data.length(); i++) { + for (size_t i = 0; i < data.length(); i++) { u8 c = data[i]; if (c == '\n' || c == 0xff) fast = false; @@ -117,7 +117,7 @@ void Client::send_data(StringView data) } StringBuilder builder; - for (int i = 0; i < data.length(); i++) { + for (size_t i = 0; i < data.length(); i++) { u8 c = data[i]; switch (c) { @@ -136,7 +136,6 @@ void Client::send_data(StringView data) m_socket->write(builder.to_string()); } - void Client::send_command(Command command) { send_commands({ command }); diff --git a/Servers/TelnetServer/Parser.cpp b/Servers/TelnetServer/Parser.cpp index 6c05ce7e2e..09d2250efa 100644 --- a/Servers/TelnetServer/Parser.cpp +++ b/Servers/TelnetServer/Parser.cpp @@ -6,7 +6,7 @@ void Parser::write(const StringView& data) { - for (int i = 0; i < data.length(); i++) { + for (size_t i = 0; i < data.length(); i++) { u8 ch = data[i]; switch (m_state) { |