Skip to content

Commit 16ed7c5

Browse files
ikegami-tigaw
authored andcommitted
huawei: enable huawei-nvme.c build without json-c dependencies checking
Only build json print codes with CONFIG_JSONC build option instead. Signed-off-by: Tokunori Ikegami <[email protected]>
1 parent f3e05ae commit 16ed7c5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

plugins/huawei/huawei-nvme.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ static int huawei_get_nvme_info(int fd, struct huawei_list_item *item, const cha
117117
return 0;
118118
}
119119

120+
#ifdef CONFIG_JSONC
120121
static void format(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz)
121122
{
122123
fmt_sz = snprintf(formatter, fmt_sz, "%-*.*s", (int)tofmtsz, (int)tofmtsz, tofmt);
@@ -177,6 +178,7 @@ static void huawei_json_print_list_items(struct huawei_list_item *list_items,
177178
printf("\n");
178179
json_free_object(root);
179180
}
181+
#endif /* CONFIG_JSONC */
180182

181183
static void huawei_print_list_head(struct huawei_list_element_len element_len)
182184
{
@@ -351,9 +353,11 @@ static int huawei_list(int argc, char **argv, struct command *command,
351353
}
352354

353355
if (huawei_num > 0) {
356+
#ifdef CONFIG_JSONC
354357
if (fmt == JSON)
355358
huawei_json_print_list_items(list_items, huawei_num);
356359
else
360+
#endif /* CONFIG_JSONC */
357361
huawei_print_list_items(list_items, huawei_num);
358362
}
359363
out_free_list_items:

plugins/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
if json_c_dep.found()
44
sources += [
5-
'plugins/huawei/huawei-nvme.c',
65
'plugins/intel/intel-nvme.c',
76
'plugins/micron/micron-nvme.c',
87
'plugins/nbft/nbft-plugin.c',
@@ -24,6 +23,7 @@ sources += [
2423
'plugins/dell/dell-nvme.c',
2524
'plugins/dera/dera-nvme.c',
2625
'plugins/fdp/fdp.c',
26+
'plugins/huawei/huawei-nvme.c',
2727
'plugins/innogrit/innogrit-nvme.c',
2828
'plugins/inspur/inspur-nvme.c',
2929
'plugins/memblaze/memblaze-nvme.c',

0 commit comments

Comments
 (0)