From b096e85777b2c9db5a45da63434b1cb5157a4606 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 6 Sep 2021 18:22:58 +0200 Subject: [PATCH] AK: Make Json{Array,Object}Serializer ignore append() return values 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. --- AK/JsonArraySerializer.h | 38 ++++++++++++++++---------------- AK/JsonObjectSerializer.h | 46 +++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/AK/JsonArraySerializer.h b/AK/JsonArraySerializer.h index 2137146eab..38cb744f85 100644 --- a/AK/JsonArraySerializer.h +++ b/AK/JsonArraySerializer.h @@ -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 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; } diff --git a/AK/JsonObjectSerializer.h b/AK/JsonObjectSerializer.h index 4c50a6fa72..52831ed268 100644 --- a/AK/JsonObjectSerializer.h +++ b/AK/JsonObjectSerializer.h @@ -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;