]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme-print-json: Update function sigs for !json-c builds
authorDaniel Wagner <dwagner@suse.de>
Thu, 25 May 2023 17:37:09 +0000 (19:37 +0200)
committerDaniel Wagner <wagi@monom.org>
Thu, 25 May 2023 17:57:03 +0000 (19:57 +0200)
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 <dwagner@suse.de>
nvme-print-json.h

index f9b27174f189e4ce6e852e7b1bcb06553b0e23de..40aebfa8f536f29d75f9da75fb553992aae2cfcb 100644 (file)
@@ -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)