Skip to content

feat: use nvme_show_err() helper function #3137

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 3 commits into from
Apr 2, 2026
Merged

feat: use nvme_show_err() helper function #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad35010
nvme: change nvme_show_err parameters order
ikegami-t Apr 1, 2026
bbb6324
nvme-print: change nvme_show_err parameter msg to fmt
ikegami-t Apr 1, 2026
d605202
feat: use nvme_show_err() helper function
ikegami-t Mar 8, 2026
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
15 changes: 13 additions & 2 deletions nvme-print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,20 @@ static void nvme_show_cmd_err(const char *msg, bool admin, __u8 opcode, int err)
nvme_show_status(err);
}

void nvme_show_err(const char *msg, int err)
void nvme_show_err(int err, const char *fmt, ...)
{
nvme_show_cmd_err(msg, false, 0, err);
va_list ap;

_cleanup_free_ char *msg = NULL;

va_start(ap, fmt);

if (vasprintf(&msg, fmt, ap) < 0)
msg = NULL;

nvme_show_cmd_err(msg ? msg : alloc_error, false, 0, err);

va_end(ap);
}

void nvme_show_io_cmd_err(const char *msg, __u8 opcode, int err)
Expand Down
2 changes: 1 addition & 1 deletion nvme-print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ struct print_ops *nvme_get_stdout_print_ops(nvme_print_flags_t flags);
struct print_ops *nvme_get_binary_print_ops(nvme_print_flags_t flags);

void nvme_show_status(int status);
void nvme_show_err(const char *msg, int err);
void nvme_show_err(int err, const char *fmt, ...);
void nvme_show_io_cmd_err(const char *msg, __u8 opcode, int err);
void nvme_show_admin_cmd_err(const char *msg, __u8 opcode, int err);
void nvme_show_opcode_status(int status, bool admin, __u8 opcode);
Expand Down
Loading
Loading