summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2004-01-30 22:54:20 +0000
committerEric Andersen2004-01-30 22:54:20 +0000
commitdfcb5b041242d08944d3c34eef36dfff1a9177c3 (patch)
tree618dfd4c93ffc48caf873c711052f793a3c022b0
parent0f56de665c12763d74f402fa5ac6edd95202caaa (diff)
downloadbusybox-dfcb5b041242d08944d3c34eef36dfff1a9177c3.zip
busybox-dfcb5b041242d08944d3c34eef36dfff1a9177c3.tar.gz
s/u_int/uint/g
-rw-r--r--archival/rpm.c16
-rw-r--r--archival/rpm2cpio.c18
-rw-r--r--util-linux/fdisk.c8
-rw-r--r--util-linux/fsck_minix.c54
4 files changed, 48 insertions, 48 deletions
diff --git a/archival/rpm.c b/archival/rpm.c
index e3f20ca..eb2c043 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -82,10 +82,10 @@ enum rpm_functions_e {
};
typedef struct {
- u_int32_t tag; /* 4 byte tag */
- u_int32_t type; /* 4 byte type */
- u_int32_t offset; /* 4 byte offset */
- u_int32_t count; /* 4 byte count */
+ uint32_t tag; /* 4 byte tag */
+ uint32_t type; /* 4 byte type */
+ uint32_t offset; /* 4 byte offset */
+ uint32_t count; /* 4 byte count */
} rpm_index;
static void *map;
@@ -227,10 +227,10 @@ rpm_index **rpm_gettags(int fd, int *num_tags)
for (pass = 0; pass < 2; pass++) { /* 1st pass is the signature headers, 2nd is the main stuff */
struct {
char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
- u_int8_t version; /* 1 byte version number */
- u_int32_t reserved; /* 4 bytes reserved */
- u_int32_t entries; /* Number of entries in header (4 bytes) */
- u_int32_t size; /* Size of store (4 bytes) */
+ uint8_t version; /* 1 byte version number */
+ uint32_t reserved; /* 4 bytes reserved */
+ uint32_t entries; /* Number of entries in header (4 bytes) */
+ uint32_t size; /* Size of store (4 bytes) */
} header;
rpm_index *tmpindex;
int storepos;
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 47f4e73..d0041a8 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -31,21 +31,21 @@
struct rpm_lead {
unsigned char magic[4];
- u_int8_t major, minor;
- u_int16_t type;
- u_int16_t archnum;
+ uint8_t major, minor;
+ uint16_t type;
+ uint16_t archnum;
char name[66];
- u_int16_t osnum;
- u_int16_t signature_type;
+ uint16_t osnum;
+ uint16_t signature_type;
char reserved[16];
};
struct rpm_header {
char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
- u_int8_t version; /* 1 byte version number */
- u_int32_t reserved; /* 4 bytes reserved */
- u_int32_t entries; /* Number of entries in header (4 bytes) */
- u_int32_t size; /* Size of store (4 bytes) */
+ uint8_t version; /* 1 byte version number */
+ uint32_t reserved; /* 4 bytes reserved */
+ uint32_t entries; /* Number of entries in header (4 bytes) */
+ uint32_t size; /* Size of store (4 bytes) */
};
void skip_header(int rpm_fd)
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 2088e6c..8913803 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 3a69147..4d07e02 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];
};