nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.4+really2.3.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:22:16 +01:00
parent 58746eb9a3
commit 1fbda9c797
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
458 changed files with 5141 additions and 7138 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/json.h
View file

@ -2,7 +2,6 @@
#ifndef __JSON__H
#define __JSON__H
#ifdef CONFIG_JSONC
#include <json.h>
#include "util/types.h"
@ -13,7 +12,7 @@
#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_uint64(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))
#ifndef CONFIG_JSONC_14
@ -49,11 +48,4 @@ struct json_object *util_json_object_new_uint128(nvme_uint128_t val);
struct json_object *util_json_object_new_uint128(nvme_uint128_t val);
uint64_t util_json_object_get_uint64(struct json_object *obj);
#else /* !CONFIG_JSONC */
struct json_object;
#endif
#endif