From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 23 Sep 2013 09:31:43 +0000 (+0800)
Subject: discover/boot: Allow printf formatting in update_status
X-Git-Tag: v1.0.0~481
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=748bd3f1bd8ffff60653f7a54f51cc5f63696c68

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 583d141..6095cd8 100644
--- 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,