[PATCH 09/29] discover: Use device_handler_status_dev_* for device-specific status

[Samuel Mendoza-Jonas]

From: Jeremy Kerr <jk at ozlabs.org>

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
Signed-off-by: Samuel Mendoza-Jonas <sam at mendozajonas.com>
---
 discover/device-handler.c | 39 ++++++++++++---------------------------
 discover/pxe-parser.c     |  5 +++--
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/discover/device-handler.c b/discover/device-handler.c
index aa693e4..a9a24ae 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -904,15 +904,14 @@ int device_handler_discover(struct device_handler *handler,
 	struct discover_context *ctx;
 	int rc;
 
-	/*
-	 * TRANSLATORS: this string will be passed the type and identifier
-	 * of the device. For example, the first parameter could be "Disk",
-	 * (which will be translated accordingly) and the second a Linux device
-	 * identifier like 'sda1' (which will not be translated)
-	 */
-	device_handler_status_info(handler, _("Processing %s device %s"),
-				device_type_display_name(dev->device->type),
-				dev->device->id);
+	device_handler_status_dev_info(handler, dev,
+		/*
+		 * TRANSLATORS: this string will be passed the type of the
+		 * device (eg "disk" or "network"), which will be translated
+		 * accordingly.
+		 */
+		_("Processing new %s device"),
+		device_type_display_name(dev->device->type));
 
 	process_boot_option_queue(handler);
 
@@ -934,12 +933,7 @@ int device_handler_discover(struct device_handler *handler,
 	device_handler_discover_context_commit(handler, ctx);
 
 out:
-	/*
-	 * TRANSLATORS: the format specifier in this string is a Linux
-	 * device identifier, like 'sda1'
-	 */
-	device_handler_status_info(handler, _("Processing %s complete"),
-				dev->device->id);
+	device_handler_status_dev_info(handler, dev, _("Processing complete"));
 
 	talloc_unlink(handler, ctx);
 
@@ -952,12 +946,8 @@ int device_handler_dhcp(struct device_handler *handler,
 {
 	struct discover_context *ctx;
 
-	/*
-	 * TRANSLATORS: this format specifier will be the name of a network
-	 * device, like 'eth0'.
-	 */
-	device_handler_status_info(handler, _("Processing dhcp event on %s"),
-				dev->device->id);
+	device_handler_status_dev_info(handler, dev,
+			_("Processing dhcp event"));
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
@@ -968,12 +958,7 @@ int device_handler_dhcp(struct device_handler *handler,
 
 	device_handler_discover_context_commit(handler, ctx);
 
-	/*
-	 * TRANSLATORS: this format specifier will be the name of a network
-	 * device, like 'eth0'.
-	 */
-	device_handler_status_info(handler, _("Processing %s complete"),
-				dev->device->id);
+	device_handler_status_dev_info(handler, dev, _("Processing complete"));
 
 	talloc_unlink(handler, ctx);
 
diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 5ac6990..8237c4b 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -282,8 +282,9 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 	 * TRANSLATORS: the format specifier in this string in an IP address,
 	 * eg. 192.168.1.1
 	 */
-	device_handler_status_info(handler, _("pxe: parsed config for %s"),
-					conf->dc->conf_url->host);
+	device_handler_status_dev_info(handler, conf->dc->device,
+			_("Parsed PXE config from %s"),
+			conf->dc->conf_url->host);
 
 	talloc_free(buf);
 out_clean:
-- 
2.10.2