From: Peter Tyser <ptyser@xes-inc.com>
Date: Mon, 5 Apr 2010 03:36:03 +0000 (-0500)
Subject: mkimage: Fix strict-aliasing compiler warning
X-Git-Tag: v2010.06-rc1~113
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2513e27e8df2b7bf481d03e7719f91ce19e89d5;p=kernel%2Fu-boot.git

mkimage: Fix strict-aliasing compiler warning

Version 4.2.4 of gcc produces the following warnings without this change:
  mkimage.c: In function ‘main’:
  mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules
  mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 5c3e872..f5859d7 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -145,7 +145,7 @@ main (int argc, char **argv)
 {
 	int ifd = -1;
 	struct stat sbuf;
-	unsigned char *ptr;
+	char *ptr;
 	int retval = 0;
 	struct image_type_params *tparams = NULL;
 
@@ -201,8 +201,7 @@ main (int argc, char **argv)
 			case 'a':
 				if (--argc <= 0)
 					usage ();
-				params.addr = strtoul (*++argv,
-					(char **)&ptr, 16);
+				params.addr = strtoul (*++argv, &ptr, 16);
 				if (*ptr) {
 					fprintf (stderr,
 						"%s: invalid load address %s\n",
@@ -219,8 +218,7 @@ main (int argc, char **argv)
 			case 'e':
 				if (--argc <= 0)
 					usage ();
-				params.ep = strtoul (*++argv,
-						(char **)&ptr, 16);
+				params.ep = strtoul (*++argv, &ptr, 16);
 				if (*ptr) {
 					fprintf (stderr,
 						"%s: invalid entry point %s\n",