ocp: replace to use json_object_* macros to obj_* macros

Since currently mixed to use them in ocp-print-json.c then unify.

Signed-off-by: Tokunori Ikegami <[email protected]>

nvme-print-json.c

@@ -22,13 +22,6 @@
 #define array_add_obj json_array_add_value_object
 #define array_add_str json_array_add_value_string
 
-#define obj_add_array json_object_add_value_array
-#define obj_add_int json_object_add_value_int
-#define obj_add_obj json_object_add_value_object
-#define obj_add_uint json_object_add_value_uint
-#define obj_add_uint128 json_object_add_value_uint128
-#define obj_add_uint64 json_object_add_value_uint64
-
 static const uint8_t zero_uuid[16] = { 0 };
 static struct print_ops json_print_ops;
 static struct json_object *json_r;

nvme-print.h

@@ -21,6 +21,13 @@ typedef struct nvme_effects_log_node {
 #define STR_LEN 100
 
 #define obj_add_str json_object_add_value_string
+#define obj_add_int json_object_add_value_int
+#define obj_add_uint json_object_add_value_uint
+#define obj_add_uint64 json_object_add_value_uint64
+#define obj_add_uint128 json_object_add_value_uint128
+#define obj_add_obj json_object_add_value_object
+#define obj_add_array json_object_add_value_array
+#define obj_new_str_len json_object_new_string_len
 
 void d(unsigned char *buf, int len, int width, int group);
 void d_raw(unsigned char *buf, unsigned len);