diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-14 11:45:01 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-15 08:50:45 +0100 |
commit | b1e8f46c318d88df8e0939e6cf2428ba4c343957 (patch) | |
tree | 89c247b1baca24664887a77b9ce55d04ec38887a /src/shared/json.c | |
parent | 614b022c76e72a3d20ff48f2bc58ca7c3f86b84f (diff) | |
download | systemd-b1e8f46c318d88df8e0939e6cf2428ba4c343957.tar.gz |
Move and rename parse_json_argument() function
json.[ch] is a very generic implementation, and cmdline argument parsing
doesn't fit there.
Diffstat (limited to 'src/shared/json.c')
-rw-r--r-- | src/shared/json.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/shared/json.c b/src/shared/json.c index b8f8292e74..cc79375410 100644 --- a/src/shared/json.c +++ b/src/shared/json.c @@ -4459,27 +4459,6 @@ int json_variant_unhex(JsonVariant *v, void **ret, size_t *ret_size) { return unhexmem(json_variant_string(v), (size_t) -1, ret, ret_size); } -int json_parse_cmdline_parameter_and_warn(const char *s, JsonFormatFlags *ret) { - assert(s); - assert(ret); - - if (streq(s, "pretty")) - *ret = JSON_FORMAT_PRETTY|JSON_FORMAT_COLOR_AUTO; - else if (streq(s, "short")) - *ret = JSON_FORMAT_NEWLINE; - else if (streq(s, "off")) - *ret = JSON_FORMAT_OFF; - else if (streq(s, "help")) { - puts("pretty\n" - "short\n" - "off"); - return 0; /* 0 means → we showed a brief help, exit now */ - } else - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown argument to --json= switch: %s", s); - - return 1; /* 1 means → properly parsed */ -} - static const char* const json_variant_type_table[_JSON_VARIANT_TYPE_MAX] = { [JSON_VARIANT_STRING] = "string", [JSON_VARIANT_INTEGER] = "integer", |