summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2016-12-07 11:30:27 +1100
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-12-20 15:04:18 +1100
commit211d7eb1de2d3a9cd97846deb9a85a934dae2981 (patch)
tree335449f626e1b0c5fee6f6d9492323142fd036b2 /discover
parent4b06a4645e19830581505a675075773adc0857c2 (diff)
downloadtalos-petitboot-211d7eb1de2d3a9cd97846deb9a85a934dae2981.tar.gz
talos-petitboot-211d7eb1de2d3a9cd97846deb9a85a934dae2981.zip
types: Remove detail and progress from struct status
Nothing used these, and the serialisation was buggy anyway. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover')
-rw-r--r--discover/boot.c2
-rw-r--r--discover/device-handler.c8
2 files changed, 0 insertions, 10 deletions
diff --git a/discover/boot.c b/discover/boot.c
index 70e9d41..056d02d 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -154,8 +154,6 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
va_end(ap);
status.type = type;
- status.progress = -1;
- status.detail = NULL;
pb_debug("boot status: [%d] %s\n", type, status.message);
diff --git a/discover/device-handler.c b/discover/device-handler.c
index 20df8d1..2e96c2b 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -423,8 +423,6 @@ static void countdown_status(struct device_handler *handler,
struct status status;
status.type = STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
status.message = talloc_asprintf(handler,
_("Booting in %d sec: %s"), sec, opt->option->name);
@@ -986,8 +984,6 @@ void device_handler_cancel_default(struct device_handler *handler)
handler->default_boot_option = NULL;
status.type = STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
status.message = _("Default boot cancelled");
discover_server_notify_boot_status(handler->server, &status);
@@ -1088,11 +1084,7 @@ void device_handler_process_url(struct device_handler *handler,
struct param *param;
status = talloc(handler, struct status);
-
status->type = STATUS_ERROR;
- status->progress = 0;
- status->detail = talloc_asprintf(status,
- _("Received config URL %s"), url);
if (!handler->network) {
status->message = talloc_asprintf(handler,
OpenPOWER on IntegriCloud