RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:07:44 +00:00
Code Issues Activity Actions

AK: Make Vector use size_t for its size and capacity

Browse source
This commit is contained in:
Andreas Kling 2020-02-25 14:49:47 +01:00
parent 9c6f7d3e7d
commit ceec1a7d38
94 changed files with 323 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibCore/ArgsParser.cpp
View file

@ -48,14 +48,14 @@ void ArgsParser::parse(int argc, char** argv)
int index_of_found_long_option = -1;
for (int i = 0; i < m_options.size(); i++) {
for (size_t i = 0; i < m_options.size(); i++) {
auto& opt = m_options[i];
if (opt.long_name) {
option long_opt {
opt.long_name,
opt.requires_argument ? required_argument : no_argument,
&index_of_found_long_option,
i
static_cast<int>(i)
};
long_options.append(long_opt);
}
@ -107,7 +107,7 @@ void ArgsParser::parse(int argc, char** argv)
int values_left = argc - optind;
int num_values_for_arg[m_positional_args.size()];
int total_values_required = 0;
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
num_values_for_arg[i] = arg.min_values;
total_values_required += arg.min_values;
@ -117,7 +117,7 @@ void ArgsParser::parse(int argc, char** argv)
print_usage_and_exit();
int extra_values_to_distribute = values_left - total_values_required;
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
int extra_values_to_this_arg = min(arg.max_values - arg.min_values, extra_values_to_distribute);
num_values_for_arg[i] += extra_values_to_this_arg;
@ -131,7 +131,7 @@ void ArgsParser::parse(int argc, char** argv)
print_usage_and_exit();
}
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
for (int j = 0; j < num_values_for_arg[i]; j++) {
const char* value = argv[optind++];

2
Libraries/LibCore/EventLoop.cpp
View file

@ -296,7 +296,7 @@ void EventLoop::pump(WaitMode mode)
events = move(m_queued_events);
}
for (int i = 0; i < events.size(); ++i) {
for (size_t i = 0; i < events.size(); ++i) {
auto& queued_event = events.at(i);
#ifndef __clang__
ASSERT(queued_event.event);

10
Libraries/LibCore/IODevice.cpp
View file

@ -60,7 +60,7 @@ int IODevice::read(u8* buffer, int length)
return read_buffer.size();
}
ByteBuffer IODevice::read(int max_size)
ByteBuffer IODevice::read(size_t max_size)
{
if (m_fd < 0)
return {};
@ -68,8 +68,8 @@ ByteBuffer IODevice::read(int max_size)
return {};
auto buffer = ByteBuffer::create_uninitialized(max_size);
auto* buffer_ptr = (char*)buffer.data();
int remaining_buffer_space = buffer.size();
int taken_from_buffered = 0;
size_t remaining_buffer_space = buffer.size();
size_t taken_from_buffered = 0;
if (!m_buffered_data.is_empty()) {
taken_from_buffered = min(remaining_buffer_space, m_buffered_data.size());
memcpy(buffer_ptr, m_buffered_data.data(), taken_from_buffered);
@ -171,7 +171,7 @@ ByteBuffer IODevice::read_all()
return ByteBuffer::copy(data.data(), data.size());
}
ByteBuffer IODevice::read_line(int max_size)
ByteBuffer IODevice::read_line(size_t max_size)
{
if (m_fd < 0)
return {};
@ -189,7 +189,7 @@ ByteBuffer IODevice::read_line(int max_size)
return buffer;
}
auto line = ByteBuffer::create_uninitialized(max_size + 1);
int line_index = 0;
size_t line_index = 0;
while (line_index < max_size) {
u8 ch = m_buffered_data[line_index];
line[line_index++] = ch;

4
Libraries/LibCore/IODevice.h
View file

@ -58,8 +58,8 @@ public:
int read(u8* buffer, int length);
ByteBuffer read(int max_size);
ByteBuffer read_line(int max_size);
ByteBuffer read(size_t max_size);
ByteBuffer read_line(size_t max_size);
ByteBuffer read_all();
bool write(const u8*, int size);

2
Libraries/LibCore/Object.cpp
View file

@ -102,7 +102,7 @@ void Object::insert_child_before(Object& new_child, Object& before_child)
void Object::remove_child(Object& object)
{
for (int i = 0; i < m_children.size(); ++i) {
for (size_t i = 0; i < m_children.size(); ++i) {
if (m_children.ptr_at(i).ptr() == &object) {
// NOTE: We protect the child so it survives the handling of ChildRemoved.
NonnullRefPtr<Object> protector = object;