diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:11:40 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-26 05:18:07 +0000 |
commit | 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 (patch) | |
tree | 82f2949088d2502e947b83ba9973de54f9bf4402 /nvme.h | |
parent | Releasing debian version 2.0-1. (diff) | |
download | nvme-cli-2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891.tar.xz nvme-cli-2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891.zip |
Merging upstream version 2.1~rc0 (Closes: #1015722).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'nvme.h')
-rw-r--r-- | nvme.h | 41 |
1 files changed, 1 insertions, 40 deletions
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Definitions for the NVM Express interface * Copyright (c) 2011-2014, Intel Corporation. @@ -22,47 +23,7 @@ #include <sys/time.h> #include "plugin.h" -#ifdef CONFIG_JSONC -#include <json.h> - -#define json_create_object(o) json_object_new_object(o) -#define json_create_array(a) json_object_new_array(a) -#define json_free_object(o) json_object_put(o) -#define json_free_array(a) json_object_put(a) -#define json_object_add_value_uint(o, k, v) \ - json_object_object_add(o, k, json_object_new_int(v)) -#define json_object_add_value_int(o, k, v) \ - json_object_object_add(o, k, json_object_new_int(v)) -#ifdef CONFIG_JSONC_14 -#define json_object_add_value_uint64(o, k, v) \ - json_object_object_add(o, k, json_object_new_uint64(v)) -#else -#define json_object_add_value_uint64(o, k, v) \ - if ((v) > UINT_MAX) { \ - fprintf(stderr, "Value overflow in %s", k); \ - json_object_object_add(o, k, json_object_new_int(-1)); \ - } else \ - json_object_object_add(o, k, json_object_new_int(v)) -#endif -#define json_object_add_value_float(o, k, v) \ - json_object_object_add(o, k, json_object_new_double(v)) -#define json_object_add_value_string(o, k, v) \ - json_object_object_add(o, k, json_object_new_string(v)) -#define json_object_add_value_array(o, k, v) \ - json_object_object_add(o, k, v) -#define json_object_add_value_object(o, k, v) \ - json_object_object_add(o, k, v) -#define json_array_add_value_object(o, k) \ - json_object_array_add(o, k) -#define json_array_add_value_string(o, v) \ - json_object_array_add(o, json_object_new_string(v)) -#define json_print_object(o, u) \ - printf("%s", json_object_to_json_string_ext(o, \ - JSON_C_TO_STRING_PRETTY | \ - JSON_C_TO_STRING_NOSLASHESCAPE)) -#else #include "util/json.h" -#endif #include "util/argconfig.h" enum nvme_print_flags { |