summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-10-13 13:11:09 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-13 17:39:49 +0200
commita64c756ad96e1ce08ff41b7ce305631bb09929c2 (patch)
tree77bad0bb56879c6ebc5335a3fc140f41acfb145e /scripts
parentb531c53e74ed686947bd45eab22fb4d3b793a33b (diff)
downloadbarebox-a64c756ad96e1ce08ff41b7ce305631bb09929c2.tar.gz
barebox-a64c756ad96e1ce08ff41b7ce305631bb09929c2.tar.xz
image: remove confusing image_check_* functions
The function names do not make it clear what return value is expected and do not save a single line of code. Put the code inline and unbreak the wrong checks introduced with a3c1e5d888d0ee317ffc7635694684bb71213c9c. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Eric BĂ©nard <eric@eukrea.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mkimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkimage.c b/scripts/mkimage.c
index f6cbb1c4c9..40a3483138 100644
--- a/scripts/mkimage.c
+++ b/scripts/mkimage.c
@@ -224,7 +224,7 @@ NXTARG: ;
*/
memcpy (hdr, ptr, sizeof(image_header_t));
- if (image_check_magic(hdr)) {
+ if (image_get_magic(hdr) != IH_MAGIC) {
fprintf (stderr,
"%s: Bad Magic Number: \"%s\" is no valid image\n",
cmdname, imagefile);