Skip to content

huawei: enable huawei-nvme.c build without json-c dependencies checking #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 1 commit into from
Dec 20, 2024
Merged

huawei: enable huawei-nvme.c build without json-c dependencies checking #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions plugins/huawei/huawei-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ static int huawei_get_nvme_info(int fd, struct huawei_list_item *item, const cha
return 0;
}

#ifdef CONFIG_JSONC
static void format(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz)
{
fmt_sz = snprintf(formatter, fmt_sz, "%-*.*s", (int)tofmtsz, (int)tofmtsz, tofmt);
Expand Down Expand Up @@ -177,6 +178,7 @@ static void huawei_json_print_list_items(struct huawei_list_item *list_items,
printf("\n");
json_free_object(root);
}
#endif /* CONFIG_JSONC */

static void huawei_print_list_head(struct huawei_list_element_len element_len)
{
Expand Down Expand Up @@ -351,9 +353,11 @@ static int huawei_list(int argc, char **argv, struct command *command,
}

if (huawei_num > 0) {
#ifdef CONFIG_JSONC
if (fmt == JSON)
huawei_json_print_list_items(list_items, huawei_num);
else
#endif /* CONFIG_JSONC */
huawei_print_list_items(list_items, huawei_num);
}
out_free_list_items:
Expand Down
2 changes: 1 addition & 1 deletion plugins/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

if json_c_dep.found()
sources += [
'plugins/huawei/huawei-nvme.c',
'plugins/intel/intel-nvme.c',
'plugins/micron/micron-nvme.c',
'plugins/nbft/nbft-plugin.c',
Expand All @@ -24,6 +23,7 @@ sources += [
'plugins/dell/dell-nvme.c',
'plugins/dera/dera-nvme.c',
'plugins/fdp/fdp.c',
'plugins/huawei/huawei-nvme.c',
'plugins/innogrit/innogrit-nvme.c',
'plugins/inspur/inspur-nvme.c',
'plugins/memblaze/memblaze-nvme.c',
Expand Down
Loading