From 57e70512d01bf7b24e927c8f0cbc30aeefcf7fe5 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 23 Jun 2020 00:55:16 -0700 Subject: [PATCH] ircd::json: Minor cleanup; simplify conditionals. --- ircd/json.cc | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/ircd/json.cc b/ircd/json.cc index fb38e5488..8140febb0 100644 --- a/ircd/json.cc +++ b/ircd/json.cc @@ -3401,43 +3401,28 @@ ircd::json::stringify(mutable_buffer &buf, consume(buf, copy(buf, "true"_sv)); else consume(buf, copy(buf, "false"_sv)); - break; } case OBJECT: { if(v.serial) - { stringify(buf, json::object{string_view{v}}); - break; - } - - if(v.object) - { + else if(v.object) stringify(buf, v.object, v.object + v.len); - break; - } - - consume(buf, copy(buf, empty_object)); + else + consume(buf, copy(buf, empty_object)); break; } case ARRAY: { if(v.serial) - { stringify(buf, json::array{string_view{v}}); - break; - } - - if(v.array) - { + else if(v.array) stringify(buf, v.array, v.array + v.len); - break; - } - - consume(buf, copy(buf, empty_array)); + else + consume(buf, copy(buf, empty_array)); break; } @@ -3450,7 +3435,6 @@ ircd::json::stringify(mutable_buffer &buf, consume(buf, copy(buf, lex_cast(v.floating))); else consume(buf, copy(buf, lex_cast(v.integer))); - break; } }