diff options
| author | Brian C. Lane <bcl@redhat.com> | 2020-11-12 16:08:31 -0800 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2020-11-20 14:00:58 -0800 |
| commit | 362571d09da09fb2b6fab7037af26d83b2d39b75 (patch) | |
| tree | 5a2123cdfa3d1ed78cbf1db5eca1ac48a84de3cf /libparted/fs/nilfs2/nilfs2.c | |
| parent | 1e086dba260630b63e0822731522ce04c081d95e (diff) | |
| download | parted-362571d09da09fb2b6fab7037af26d83b2d39b75.tar.gz | |
nilfs2: Fix gcc 10 warnings about cast alignment
Diffstat (limited to 'libparted/fs/nilfs2/nilfs2.c')
| -rw-r--r-- | libparted/fs/nilfs2/nilfs2.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libparted/fs/nilfs2/nilfs2.c b/libparted/fs/nilfs2/nilfs2.c index 3ca4808..2871179 100644 --- a/libparted/fs/nilfs2/nilfs2.c +++ b/libparted/fs/nilfs2/nilfs2.c @@ -34,8 +34,7 @@ /* secondary superblock offset in 512byte blocks. */ #define NILFS_SB2_OFFSET(devsize) ((((devsize)>>3) - 1) << 3) -struct nilfs2_super_block -{ +struct __attribute__ ((packed)) nilfs2_super_block { uint32_t s_rev_level; uint16_t s_minor_rev_level; uint16_t s_magic; @@ -112,18 +111,18 @@ nilfs2_probe (PedGeometry* geom) return NULL; const int sectors = (4096 + geom->dev->sector_size - 1) / geom->dev->sector_size; - char *buf = alloca (sectors * geom->dev->sector_size); + uint8_t *buf = alloca (sectors * geom->dev->sector_size); const int sectors2 = (1024 + geom->dev->sector_size -1 ) / geom->dev->sector_size; void *buff2 = alloca (sectors2 * geom->dev->sector_size); if (ped_geometry_read(geom, buf, 0, sectors)) - sb = (struct nilfs2_super_block *)(buf+1024); + sb = (struct nilfs2_super_block*)(buf + 1024); if (ped_geometry_read(geom, buff2, sb2off, sectors2)) - sb2 = buff2; + sb2 = (struct nilfs2_super_block*)buff2; if ((!sb || !is_valid_nilfs_sb(sb)) && - (!sb2 || !is_valid_nilfs_sb(sb2)) ) + (!sb2 || !is_valid_nilfs_sb(sb2))) return NULL; /* reserve 4k bytes for secondary superblock */ |