diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-03-03 10:51:58 -0800 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-03-03 23:59:07 +0000 |
| commit | 40ce87a70a064eeb462d3c3935422918c1f6114e (patch) | |
| tree | 54a5c9fcd430befffff9bdcb4a4aed1a2566d97c /ext4_utils/contents.c | |
| parent | da0703c0df9e1a14ec2edf14a286badff70dc8cc (diff) | |
| download | extras-40ce87a70a064eeb462d3c3935422918c1f6114e.tar.gz | |
Remove warnings
Remove warnings called by duplicate definition of ALIGN macro.
Note that bionic/libc/include/sys/param.h defines ALIGN as
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
which is not good - clashes with every other definition of ALIGN.
Change-Id: I2d716c41ededd2fa072f944e21d94a0c93ca9c46
Diffstat (limited to 'ext4_utils/contents.c')
| -rw-r--r-- | ext4_utils/contents.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c index 80e5692b..4aa287f2 100644 --- a/ext4_utils/contents.c +++ b/ext4_utils/contents.c @@ -45,7 +45,7 @@ static u32 dentry_size(u32 entries, struct dentry *dentries) unsigned int dentry_len; for (i = 0; i < entries; i++) { - dentry_len = 8 + ALIGN(strlen(dentries[i].filename), 4); + dentry_len = 8 + EXT4_ALIGN(strlen(dentries[i].filename), 4); if (len % info.block_size + dentry_len > info.block_size) len += info.block_size - (len % info.block_size); len += dentry_len; @@ -59,7 +59,7 @@ static struct ext4_dir_entry_2 *add_dentry(u8 *data, u32 *offset, u8 file_type) { u8 name_len = strlen(name); - u16 rec_len = 8 + ALIGN(name_len, 4); + u16 rec_len = 8 + EXT4_ALIGN(name_len, 4); struct ext4_dir_entry_2 *dentry; u32 start_block = *offset / info.block_size; |