|
 |
8d419f |
From ee588179205de7c1584bd45bd22ec59028f11405 Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
8d419f |
Date: Mon, 9 May 2022 10:24:36 +0200
|
|
|
8d419f |
Subject: [PATCH] json: align table
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 9674b089cfb1f75653579e83735e049ddcbbed7e)
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
src/shared/json.c | 18 ++++++++----------
|
|
|
8d419f |
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/src/shared/json.c b/src/shared/json.c
|
|
|
8d419f |
index dff95eda26..6375b87a0b 100644
|
|
|
8d419f |
--- a/src/shared/json.c
|
|
|
8d419f |
+++ b/src/shared/json.c
|
|
|
8d419f |
@@ -4754,7 +4754,6 @@ bool json_variant_is_sorted(JsonVariant *v) {
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
int json_variant_unbase64(JsonVariant *v, void **ret, size_t *ret_size) {
|
|
|
8d419f |
-
|
|
|
8d419f |
if (!json_variant_is_string(v))
|
|
|
8d419f |
return -EINVAL;
|
|
|
8d419f |
|
|
|
8d419f |
@@ -4762,7 +4761,6 @@ int json_variant_unbase64(JsonVariant *v, void **ret, size_t *ret_size) {
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size) {
|
|
|
8d419f |
-
|
|
|
8d419f |
if (!json_variant_is_string(v))
|
|
|
8d419f |
return -EINVAL;
|
|
|
8d419f |
|
|
|
8d419f |
@@ -4770,15 +4768,15 @@ int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size) {
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
static const char* const json_variant_type_table[_JSON_VARIANT_TYPE_MAX] = {
|
|
|
8d419f |
- [JSON_VARIANT_STRING] = "string",
|
|
|
8d419f |
- [JSON_VARIANT_INTEGER] = "integer",
|
|
|
8d419f |
+ [JSON_VARIANT_STRING] = "string",
|
|
|
8d419f |
+ [JSON_VARIANT_INTEGER] = "integer",
|
|
|
8d419f |
[JSON_VARIANT_UNSIGNED] = "unsigned",
|
|
|
8d419f |
- [JSON_VARIANT_REAL] = "real",
|
|
|
8d419f |
- [JSON_VARIANT_NUMBER] = "number",
|
|
|
8d419f |
- [JSON_VARIANT_BOOLEAN] = "boolean",
|
|
|
8d419f |
- [JSON_VARIANT_ARRAY] = "array",
|
|
|
8d419f |
- [JSON_VARIANT_OBJECT] = "object",
|
|
|
8d419f |
- [JSON_VARIANT_NULL] = "null",
|
|
|
8d419f |
+ [JSON_VARIANT_REAL] = "real",
|
|
|
8d419f |
+ [JSON_VARIANT_NUMBER] = "number",
|
|
|
8d419f |
+ [JSON_VARIANT_BOOLEAN] = "boolean",
|
|
|
8d419f |
+ [JSON_VARIANT_ARRAY] = "array",
|
|
|
8d419f |
+ [JSON_VARIANT_OBJECT] = "object",
|
|
|
8d419f |
+ [JSON_VARIANT_NULL] = "null",
|
|
|
8d419f |
};
|
|
|
8d419f |
|
|
|
8d419f |
DEFINE_STRING_TABLE_LOOKUP(json_variant_type, JsonVariantType);
|