aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-02-04 18:41:18 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-02-04 18:41:18 +0100
commit12ca080a1ca8dfd0aeac54485451b906a7e61b16 (patch)
treeabb273fb03a73bc9c20d05f9128bdfd9bfe55e55 /util-linux
parent98a4c7cf3d799ab953cb77e8b34597c73e3e7335 (diff)
downloadbusybox-w32-12ca080a1ca8dfd0aeac54485451b906a7e61b16.tar.gz
busybox-w32-12ca080a1ca8dfd0aeac54485451b906a7e61b16.tar.bz2
busybox-w32-12ca080a1ca8dfd0aeac54485451b906a7e61b16.zip
*: eliminate more aliasing warnings
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mkswap.c2
-rw-r--r--util-linux/volume_id/linux_raid.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 949c71a78..7e32d91ed 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -65,7 +65,7 @@ struct swap_header_v1 {
65 uint32_t padding[117]; /* 11..127 */ 65 uint32_t padding[117]; /* 11..127 */
66 uint32_t badpages[1]; /* 128 */ 66 uint32_t badpages[1]; /* 128 */
67 /* total 129 32-bit words in 2nd kilobyte */ 67 /* total 129 32-bit words in 2nd kilobyte */
68}; 68} FIX_ALIASING;
69 69
70#define NWORDS 129 70#define NWORDS 129
71#define hdr ((struct swap_header_v1*)bb_common_bufsiz1) 71#define hdr ((struct swap_header_v1*)bb_common_bufsiz1)
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index d1bf0c308..e1c86369d 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -44,6 +44,7 @@ struct mdp_super_block {
44 44
45int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size) 45int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/, uint64_t size)
46{ 46{
47 typedef uint32_t aliased_uint32_t FIX_ALIASING;
47#define off ((uint64_t)0) 48#define off ((uint64_t)0)
48 uint64_t sboff; 49 uint64_t sboff;
49 uint8_t uuid[16]; 50 uint8_t uuid[16];
@@ -63,7 +64,7 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/,
63 if (mdp->md_magic != cpu_to_le32(MD_MAGIC)) 64 if (mdp->md_magic != cpu_to_le32(MD_MAGIC))
64 return -1; 65 return -1;
65 66
66 *(uint32_t*)uuid = mdp->set_uuid0; 67 *(aliased_uint32_t*)uuid = mdp->set_uuid0;
67 memcpy(&uuid[4], &mdp->set_uuid1, 12); 68 memcpy(&uuid[4], &mdp->set_uuid1, 12);
68 volume_id_set_uuid(id, uuid, UUID_DCE); 69 volume_id_set_uuid(id, uuid, UUID_DCE);
69 70