discover/boot: Allow printf formatting in update_status

It'd be nice to include arbitrary format strings here, so do a
taloc_vasprintf in update_status.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/boot.c b/discover/boot.c
index 583d141ddc440ccaa45ae80288d664e65ec44828..6095cd8d865f8e02cc350b7665371b9771472e50 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -121,17 +121,23 @@ static int kexec_reboot(struct boot_task *task)
        return result;
 }
 
-static void update_status(boot_status_fn fn, void *arg, int type,
-               char *message)
+static void __attribute__((format(__printf__, 4, 5))) update_status(
+               boot_status_fn fn, void *arg, int type, char *fmt, ...)
 {
        struct boot_status status;
+       va_list ap;
+
+       va_start(ap, fmt);
+       status.message = talloc_vasprintf(NULL, fmt, ap);
+       va_end(ap);
 
        status.type = type;
-       status.message = message;
        status.progress = -1;
        status.detail = NULL;
 
        fn(arg, &status);
+
+       talloc_free(status.message);
 }
 
 static void boot_hook_update_param(void *ctx, struct boot_task *task,