diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-01-30 22:54:20 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-01-30 22:54:20 +0000 |
| commit | dfcb5b041242d08944d3c34eef36dfff1a9177c3 (patch) | |
| tree | 618dfd4c93ffc48caf873c711052f793a3c022b0 /util-linux | |
| parent | 0f56de665c12763d74f402fa5ac6edd95202caaa (diff) | |
| download | busybox-dfcb5b041242d08944d3c34eef36dfff1a9177c3.tar.gz | |
s/u_int/uint/g
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 8 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 54 |
2 files changed, 31 insertions, 31 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 2088e6c67..891380395 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -954,7 +954,7 @@ static int xbsd_part_index; #endif #if defined (__alpha__) -/* We access this through a u_int64_t * when checksumming */ +/* We access this through a uint64_t * when checksumming */ static char disklabelbuffer[BSD_BBSIZE] __attribute__((aligned(8))); #else static char disklabelbuffer[BSD_BBSIZE]; @@ -1712,16 +1712,16 @@ xbsd_link_part (void) #if defined (__alpha__) #if !defined(__GLIBC__) -typedef unsigned long long u_int64_t; +typedef unsigned long long uint64_t; #endif static void alpha_bootblock_checksum (char *boot) { - u_int64_t *dp, sum; + uint64_t *dp, sum; int i; - dp = (u_int64_t *)boot; + dp = (uint64_t *)boot; sum = 0; for (i = 0; i < 63; i++) sum += dp[i]; diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 3a691476e..4d07e028f 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -124,13 +124,13 @@ static const int MINIX_V2 = 0x0002; /* minix V2 fs */ * Note the 8-bit gid and atime and ctime. */ struct minix_inode { - u_int16_t i_mode; - u_int16_t i_uid; - u_int32_t i_size; - u_int32_t i_time; - u_int8_t i_gid; - u_int8_t i_nlinks; - u_int16_t i_zone[9]; + uint16_t i_mode; + uint16_t i_uid; + uint32_t i_size; + uint32_t i_time; + uint8_t i_gid; + uint8_t i_nlinks; + uint16_t i_zone[9]; }; /* @@ -140,35 +140,35 @@ struct minix_inode { * now 16-bit. The inode is now 64 bytes instead of 32. */ struct minix2_inode { - u_int16_t i_mode; - u_int16_t i_nlinks; - u_int16_t i_uid; - u_int16_t i_gid; - u_int32_t i_size; - u_int32_t i_atime; - u_int32_t i_mtime; - u_int32_t i_ctime; - u_int32_t i_zone[10]; + uint16_t i_mode; + uint16_t i_nlinks; + uint16_t i_uid; + uint16_t i_gid; + uint32_t i_size; + uint32_t i_atime; + uint32_t i_mtime; + uint32_t i_ctime; + uint32_t i_zone[10]; }; /* * minix super-block data on disk */ struct minix_super_block { - u_int16_t s_ninodes; - u_int16_t s_nzones; - u_int16_t s_imap_blocks; - u_int16_t s_zmap_blocks; - u_int16_t s_firstdatazone; - u_int16_t s_log_zone_size; - u_int32_t s_max_size; - u_int16_t s_magic; - u_int16_t s_state; - u_int32_t s_zones; + uint16_t s_ninodes; + uint16_t s_nzones; + uint16_t s_imap_blocks; + uint16_t s_zmap_blocks; + uint16_t s_firstdatazone; + uint16_t s_log_zone_size; + uint32_t s_max_size; + uint16_t s_magic; + uint16_t s_state; + uint32_t s_zones; }; struct minix_dir_entry { - u_int16_t inode; + uint16_t inode; char name[0]; }; |