beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Replace various copies of parse_uint(String) with String::to_uint().

Browse source
This commit is contained in:
Andreas Kling 2019-05-08 19:21:51 +02:00
parent cea631d90c
commit b5b44a29bb
Notes: sideshowbarker 2024-07-19 14:11:35 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/b5b44a29bbf
4 changed files with 6 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Applications/Terminal/Terminal.cpp
View file

@ -116,21 +116,6 @@ inline bool is_valid_final_character(byte ch)
return ch >= 0x40 && ch <= 0x7e;
}
unsigned parse_uint(const String& str, bool& ok)
{
unsigned value = 0;
for (int i = 0; i < str.length(); ++i) {
if (str[i] < '0' || str[i] > '9') {
ok = false;
return 0;
}
value = value * 10;
value += str[i] - '0';
}
ok = true;
return value;
}
static inline Color lookup_color(unsigned color)
{
return Color::from_rgb(xterm_colors[color]);
@ -397,7 +382,7 @@ void Terminal::execute_xterm_command()
{
m_final = '@';
bool ok;
unsigned value = parse_uint(String::copy(m_xterm_param1), ok);
unsigned value = String::copy(m_xterm_param1).to_uint(ok);
if (ok) {
switch (value) {
case 0:
@ -421,7 +406,7 @@ void Terminal::execute_escape_sequence(byte final)
ParamVector params;
for (auto& parampart : paramparts) {
bool ok;
unsigned value = parse_uint(parampart, ok);
unsigned value = parampart.to_uint(ok);
if (!ok) {
m_parameters.clear_with_capacity();
m_intermediates.clear_with_capacity();

17
Kernel/TTY/VirtualConsole.cpp
View file

@ -128,21 +128,6 @@ inline bool is_valid_final_character(byte ch)
return ch >= 0x40 && ch <= 0x7e;
}
unsigned parse_uint(const String& str, bool& ok)
{
unsigned value = 0;
for (int i = 0; i < str.length(); ++i) {
if (str[i] < '0' || str[i] > '9') {
ok = false;
return 0;
}
value = value * 10;
value += str[i] - '0';
}
ok = true;
return value;
}
enum class VGAColor : byte {
Black = 0,
Blue,
@ -324,7 +309,7 @@ void VirtualConsole::execute_escape_sequence(byte final)
Vector<unsigned> params;
for (auto& parampart : paramparts) {
bool ok;
unsigned value = parse_uint(parampart, ok);
unsigned value = parampart.to_uint(ok);
if (!ok) {
// FIXME: Should we do something else?
return;

23
Userland/kill.cpp
View file

@ -4,25 +4,6 @@
#include <stdlib.h>
#include <AK/AKString.h>
static unsigned parse_uint(const String& str, bool& ok)
{
if (str.is_empty()) {
ok = false;
return 0;
}
unsigned value = 0;
for (int i = 0; i < str.length(); ++i) {
if (str[i] < '0' || str[i] > '9') {
ok = false;
return 0;
}
value = value * 10;
value += (unsigned)(str[i] - '0');
}
ok = true;
return value;
}
static void print_usage_and_exit()
{
printf("usage: kill [-signal] <PID>\n");
@ -40,13 +21,13 @@ int main(int argc, char** argv)
pid_argi = 2;
if (argv[1][0] != '-')
print_usage_and_exit();
signum = parse_uint(&argv[1][1], ok);
signum = String(&argv[1][1]).to_uint(ok);
if (!ok) {
printf("'%s' is not a valid signal number\n", &argv[1][1]);
return 2;
}
}
unsigned pid = parse_uint(argv[pid_argi], ok);
unsigned pid = String(argv[pid_argi]).to_uint(ok);
if (!ok) {
printf("'%s' is not a valid PID\n", argv[pid_argi]);
return 3;

17
Userland/sleep.cpp
View file

@ -3,21 +3,6 @@
#include <signal.h>
#include <AK/AKString.h>
static unsigned parse_uint(const String& str, bool& ok)
{
unsigned value = 0;
for (int i = 0; i < str.length(); ++i) {
if (str[i] < '0' || str[i] > '9') {
ok = false;
return 0;
}
value = value * 10;
value += str[i] - '0';
}
ok = true;
return value;
}
void handle_sigint(int)
{
}
@ -29,7 +14,7 @@ int main(int argc, char** argv)
return 1;
}
bool ok;
unsigned secs = parse_uint(argv[1], ok);
unsigned secs = String(argv[1]).to_uint(ok);
if (!ok) {
fprintf(stderr, "Not a valid number of seconds: \"%s\"\n", argv[1]);
return 1;