From: Zhang Yanfei <zhangyanfei.yes@gmail.com>
To: Simon Horman <horms@verge.net.au>
Cc: "kexec@lists.infradead.org" <kexec@lists.infradead.org>
Subject: [PATCH] kexec: Use die() to simplify code
Date: Wed, 27 Mar 2013 22:00:59 +0800 [thread overview]
Message-ID: <5152FB9B.1040409@gmail.com> (raw)
From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Use die() to simplify code.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
---
kexec/arch/ppc/fixup_dtb.c | 4 +---
kexec/arch/ppc/kexec-elf-ppc.c | 3 +--
kexec/arch/ppc/kexec-uImage-ppc.c | 3 +--
kexec/arch/sh/kexec-sh.c | 3 +--
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/kexec/arch/ppc/fixup_dtb.c b/kexec/arch/ppc/fixup_dtb.c
index f832026..b10ac59 100644
--- a/kexec/arch/ppc/fixup_dtb.c
+++ b/kexec/arch/ppc/fixup_dtb.c
@@ -58,9 +58,7 @@ static void fixup_nodes(char *nodes[])
content = slurp_file(fname, &content_size);
if (!content) {
- fprintf(stderr, "Can't open %s: %s\n",
- fname, strerror(errno));
- exit(1);
+ die("Can't open %s: %s\n", fname, strerror(errno));
}
prop_name = fname + len;
diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c
index 694befb..3daca2d 100644
--- a/kexec/arch/ppc/kexec-elf-ppc.c
+++ b/kexec/arch/ppc/kexec-elf-ppc.c
@@ -227,8 +227,7 @@ int elf_ppc_load(int argc, char **argv, const char *buf, off_t len,
case OPT_NODES:
if (cur_fixup >= FIXUP_ENTRYS) {
- fprintf(stderr, "The number of entries for the fixup is too large\n");
- exit(1);
+ die("The number of entries for the fixup is too large\n");
}
fixup_nodes[cur_fixup] = optarg;
cur_fixup++;
diff --git a/kexec/arch/ppc/kexec-uImage-ppc.c b/kexec/arch/ppc/kexec-uImage-ppc.c
index c4d39f2..9113fbe 100644
--- a/kexec/arch/ppc/kexec-uImage-ppc.c
+++ b/kexec/arch/ppc/kexec-uImage-ppc.c
@@ -130,8 +130,7 @@ static int ppc_load_bare_bits(int argc, char **argv, const char *buf,
case OPT_NODES:
if (cur_fixup >= FIXUP_ENTRYS) {
- fprintf(stderr, "The number of entries for the fixup is too large\n");
- exit(1);
+ die("The number of entries for the fixup is too large\n");
}
fixup_nodes[cur_fixup] = optarg;
cur_fixup++;
diff --git a/kexec/arch/sh/kexec-sh.c b/kexec/arch/sh/kexec-sh.c
index 7710fdf..ea56041 100644
--- a/kexec/arch/sh/kexec-sh.c
+++ b/kexec/arch/sh/kexec-sh.c
@@ -159,8 +159,7 @@ char *get_append(void)
FILE *fp;
int len;
if((fp = fopen("/proc/cmdline", "r")) == NULL){
- printf("/proc/cmdline file open error !!\n");
- exit(1);
+ die("/proc/cmdline file open error !!\n");
}
fgets(append_buf, 256, fp);
len = strlen(append_buf);
--
1.7.1
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next reply other threads:[~2013-03-27 14:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-27 14:00 Zhang Yanfei [this message]
2013-03-27 14:06 ` [PATCH] kexec: Use die() to simplify code Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5152FB9B.1040409@gmail.com \
--to=zhangyanfei.yes@gmail.com \
--cc=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox