s/u_int/uint/g

This commit is contained in:
Eric Andersen
2004-01-30 22:54:20 +00:00
parent 0f56de665c
commit dfcb5b0412
4 changed files with 48 additions and 48 deletions

View File

@@ -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];

View File

@@ -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];
};