diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-03-13 10:53:26 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-03-13 10:53:26 -0400 |
| commit | a040a99b6cc4bf9f10d39747ca6947f0462a2eb2 (patch) | |
| tree | 3ebb2978e9768b271f7f15dc5bd89455c4eb3f9e /lib/blkid | |
| parent | 399033a6ab713bc1f8ebad90e47fced0e7491b62 (diff) | |
| parent | 2a60480627b28a368c82b87c0795c771c1f8769a (diff) | |
| download | android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.tar.gz android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.tar.bz2 android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.zip | |
Merge branch 'maint'
Conflicts:
lib/ext2fs/ext2_err.et.in
Diffstat (limited to 'lib/blkid')
| -rw-r--r-- | lib/blkid/probe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 10e018a9..45885c39 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -1023,15 +1023,15 @@ static int probe_hfsplus(struct blkid_probe *probe __BLKID_ATTR((unused)), } #define LVM2_LABEL_SIZE 512 -static unsigned int lvm2_calc_crc(const void *buf, uint size) +static unsigned int lvm2_calc_crc(const void *buf, unsigned int size) { - static const uint crctab[] = { + static const unsigned int crctab[] = { 0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c }; - uint i, crc = 0xf597a6cf; + unsigned int i, crc = 0xf597a6cf; const __u8 *data = (const __u8 *) buf; for (i = 0; i < size; i++) { |