system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Make Json{Array,Object}Serializer ignore append() return values

Browse source 
This is in preparation for making KBufferBuilder::append() and friends
return a KResult. Long-term we should come up with a solution that works
for both kernel and userspace clients of the JSON API.
This commit is contained in:
Andreas Kling 2021-09-06 18:22:58 +02:00
parent 60eea6940f
commit b096e85777
2 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
AK/JsonArraySerializer.h
View file

@ -19,7 +19,7 @@ public:
explicit JsonArraySerializer(Builder& builder)
: m_builder(builder)
{
m_builder.append('[');
(void)m_builder.append('[');
}
JsonArraySerializer(const JsonArraySerializer&) = delete;
@ -42,67 +42,67 @@ public:
void add(const StringView& value)
{
begin_item();
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(const String& value)
{
begin_item();
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(const char* value)
{
begin_item();
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(bool value)
{
begin_item();
m_builder.append(value ? "true"sv : "false"sv);
(void)m_builder.append(value ? "true"sv : "false"sv);
}
void add(int value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(unsigned value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(long value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(long unsigned value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(long long value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(long long unsigned value)
{
begin_item();
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
JsonArraySerializer<Builder> add_array()
@ -118,14 +118,14 @@ public:
{
VERIFY(!m_finished);
m_finished = true;
m_builder.append(']');
(void)m_builder.append(']');
}
private:
void begin_item()
{
if (!m_empty)
m_builder.append(',');
(void)m_builder.append(',');
m_empty = false;
}

46
AK/JsonObjectSerializer.h
View file

@ -20,7 +20,7 @@ public:
explicit JsonObjectSerializer(Builder& builder)
: m_builder(builder)
{
m_builder.append('{');
(void)m_builder.append('{');
}
JsonObjectSerializer(const JsonObjectSerializer&) = delete;
@ -43,74 +43,74 @@ public:
void add(const StringView& key, const StringView& value)
{
begin_item(key);
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(const StringView& key, const String& value)
{
begin_item(key);
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(const StringView& key, const char* value)
{
begin_item(key);
m_builder.append('"');
m_builder.append_escaped_for_json(value);
m_builder.append('"');
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(value);
(void)m_builder.append('"');
}
void add(const StringView& key, bool value)
{
begin_item(key);
m_builder.append(value ? "true" : "false");
(void)m_builder.append(value ? "true" : "false");
}
void add(const StringView& key, int value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(const StringView& key, unsigned value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(const StringView& key, long value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(const StringView& key, long unsigned value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(const StringView& key, long long value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
void add(const StringView& key, long long unsigned value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
#ifndef KERNEL
void add(const StringView& key, double value)
{
begin_item(key);
m_builder.appendff("{}", value);
(void)m_builder.appendff("{}", value);
}
#endif
@ -130,19 +130,19 @@ public:
{
VERIFY(!m_finished);
m_finished = true;
m_builder.append('}');
(void)m_builder.append('}');
}
private:
void begin_item(const StringView& key)
{
if (!m_empty)
m_builder.append(',');
(void)m_builder.append(',');
m_empty = false;
m_builder.append('"');
m_builder.append_escaped_for_json(key);
m_builder.append("\":");
(void)m_builder.append('"');
(void)m_builder.append_escaped_for_json(key);
(void)m_builder.append("\":");
}
Builder& m_builder;