[git commit master 1/1] remove a few aliasing warnings

Denys Vlasenko vda.linux at googlemail.com
Sun Jan 16 00:25:34 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=df1689138e71fa3648209db28146a595c4e63c26
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/libarchive/get_header_tar.c |    2 +-
 networking/udhcp/dhcprelay.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 78b0ae2..2e03327 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -199,7 +199,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 		uint16_t magic2;
 
  autodetect:
-		magic2 = *(uint16_t*)tar.name;
+		magic2 = *(bb__aliased_uint16_t*)tar.name;
 		/* tar gz/bz autodetect: check for gz/bz2 magic.
 		 * If we see the magic, and it is the very first block,
 		 * we can switch to get_header_tar_gz/bz2/lzma().
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 759a4ba..86ef04a 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -25,7 +25,7 @@ struct xid_item {
 	uint32_t xid;
 	struct sockaddr_in ip;
 	struct xid_item *next;
-};
+} FIX_ALIASING;
 
 #define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)
 
-- 
1.7.3.4



More information about the busybox-cvs mailing list