From 992ef5b43839d897b7a0043c21c828a079f21b5c Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 25 May 2023 19:37:09 +0200 Subject: [PATCH] nvme-print-json: Update function sigs for !json-c builds The json_output_* function got updated, but the !json-c case was not updated accordingly. Update them now. Fixes: e853da696ea4 ("nvme-print-json: Add json output result function") Fixes: 6e3e1cc8d5b2 ("nvme: Add nvme_show_perror to use instead of perror for json output") Fixes: 2b0bc4d824d0 ("nvme-printf: Add show error function for nvme list command json output") Signed-off-by: Daniel Wagner --- nvme-print-json.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nvme-print-json.h b/nvme-print-json.h index f9b27174..40aebfa8 100644 --- a/nvme-print-json.h +++ b/nvme-print-json.h @@ -142,10 +142,11 @@ void json_connect_msg(nvme_ctrl_t c); #define json_persistent_event_log(pevent_log_info, size) #define json_predictable_latency_event_agg_log(pea_log, log_entries) #define json_predictable_latency_per_nvmset(plpns_log, nvmset_id) +#define json_output_error(msg, ap) +#define json_output_result(msg, ap) #define json_output_status(status) -#define json_output_error(const char *msg, va_list ap) -#define json_output_perror(const char *msg) -#define json_output_result(const char *msg, va_list ap) +#define json_output_message(error, msg, ap) +#define json_output_perror(msg) /* fabrics.c */ #define json_discovery_log(log, numrec) -- 2.49.0