Skip to content
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.

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

nvme: Add output-format default option instead of argconfig json option #2064

Merged
merged 1 commit into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions nvme-print.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ void nvme_show_status(int status)
{
struct print_ops *ops;

if (argconfig_get_output_format_json())
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops =nvme_print_ops(0);
Expand Down Expand Up @@ -1035,7 +1035,7 @@ void nvme_show_message(bool error, const char *msg, ...)
va_list ap;
va_start(ap, msg);

if (argconfig_get_output_format_json())
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops = nvme_print_ops(0);
Expand All @@ -1054,7 +1054,7 @@ void nvme_show_perror(const char *msg)
{
struct print_ops *ops;

if (argconfig_get_output_format_json())
if (nvme_is_output_format_json())
ops = nvme_print_ops(JSON);
else
ops = nvme_print_ops(0);
Expand Down
Loading