From 6b842bb2559116a949c6a569ac39f5c56ebc1be1 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 27 Feb 2013 14:22:01 +0800
Subject: ui: pb_kexec_data -> pb_boot_data

find ui/ -type f |
	xargs sed -i -e s/pb_kexec_data/pb_boot_data/g \
		-e 's/\<kd\>/bd/g'

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 ui/common/ui-system.c | 18 +++++++++---------
 ui/common/ui-system.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ui/common')

diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index b4ae8f8..a828e2e 100644
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -145,7 +145,7 @@ static int kexec_reboot(int dry_run)
  * pb_run_kexec - Run kexec with the supplied boot options.
  */
 
-int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run)
 {
 	int result;
 	char *l_image = NULL;
@@ -153,20 +153,20 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
 	unsigned int clean_image = 0;
 	unsigned int clean_initrd = 0;
 
-	pb_log("%s: image:   '%s'\n", __func__, kd->image);
-	pb_log("%s: initrd:  '%s'\n", __func__, kd->initrd);
-	pb_log("%s: args:    '%s'\n", __func__, kd->args);
+	pb_log("%s: image:   '%s'\n", __func__, bd->image);
+	pb_log("%s: initrd:  '%s'\n", __func__, bd->initrd);
+	pb_log("%s: args:    '%s'\n", __func__, bd->args);
 
 	result = -1;
 
-	if (kd->image) {
-		l_image = pb_load_file(NULL, kd->image, &clean_image);
+	if (bd->image) {
+		l_image = pb_load_file(NULL, bd->image, &clean_image);
 		if (!l_image)
 			goto no_load;
 	}
 
-	if (kd->initrd) {
-		l_initrd = pb_load_file(NULL, kd->initrd, &clean_initrd);
+	if (bd->initrd) {
+		l_initrd = pb_load_file(NULL, bd->initrd, &clean_initrd);
 		if (!l_initrd)
 			goto no_load;
 	}
@@ -174,7 +174,7 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
 	if (!l_image && !l_initrd)
 		goto no_load;
 
-	result = kexec_load(l_image, l_initrd, kd->args, dry_run);
+	result = kexec_load(l_image, l_initrd, bd->args, dry_run);
 
 no_load:
 	if (clean_image)
diff --git a/ui/common/ui-system.h b/ui/common/ui-system.h
index b75c4d1..82f630e 100644
--- a/ui/common/ui-system.h
+++ b/ui/common/ui-system.h
@@ -27,13 +27,13 @@
 
 #include <signal.h>
 
-struct pb_kexec_data {
+struct pb_boot_data {
 	char *image;
 	char *initrd;
 	char *args;
 };
 
-int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run);
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run);
 int pb_start_daemon(void);
 
 unsigned int pb_elf_hash(const char *str);
@@ -47,7 +47,7 @@ static inline uint32_t pb_opt_hash(const struct device *dev,
 
 struct pb_opt_data {
 	const char *name;
-	struct pb_kexec_data *kd;
+	struct pb_boot_data *bd;
 
 	/* optional data */
 	const struct device *dev;
-- 
cgit v1.2.1