aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fbset.c2
-rw-r--r--util-linux/fsck_minix.c60
-rw-r--r--util-linux/mkfs_minix.c60
3 files changed, 55 insertions, 67 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 41c7f9796..5ccd80e79 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -85,7 +85,7 @@ static unsigned int g_options = 0;
/* Stuff stolen from the kernel's fb.h */
static const int FBIOGET_VSCREENINFO = 0x4600;
static const int FBIOPUT_VSCREENINFO = 0x4601;
-#define __u32 unsigned int
+#define __u32 u_int32_t
struct fb_bitfield {
__u32 offset; /* beginning of bitfield */
__u32 length; /* length of bitfield */
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index a2421fc34..952968d85 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -98,12 +98,6 @@
#include <sys/param.h>
#include "busybox.h"
-
- typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-
static const int MINIX_ROOT_INO = 1;
static const int MINIX_LINK_MAX = 250;
static const int MINIX2_LINK_MAX = 65530;
@@ -130,13 +124,13 @@ static const int MINIX_V2 = 0x0002; /* minix V2 fs */
* Note the 8-bit gid and atime and ctime.
*/
struct minix_inode {
- u16 i_mode;
- u16 i_uid;
- u32 i_size;
- u32 i_time;
- u8 i_gid;
- u8 i_nlinks;
- u16 i_zone[9];
+ 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];
};
/*
@@ -146,35 +140,35 @@ struct minix_inode {
* now 16-bit. The inode is now 64 bytes instead of 32.
*/
struct minix2_inode {
- u16 i_mode;
- u16 i_nlinks;
- u16 i_uid;
- u16 i_gid;
- u32 i_size;
- u32 i_atime;
- u32 i_mtime;
- u32 i_ctime;
- u32 i_zone[10];
+ 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];
};
/*
* minix super-block data on disk
*/
struct minix_super_block {
- u16 s_ninodes;
- u16 s_nzones;
- u16 s_imap_blocks;
- u16 s_zmap_blocks;
- u16 s_firstdatazone;
- u16 s_log_zone_size;
- u32 s_max_size;
- u16 s_magic;
- u16 s_state;
- u32 s_zones;
+ 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;
};
struct minix_dir_entry {
- u16 inode;
+ u_int16_t inode;
char name[0];
};
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 70374eae9..ccc0e85d7 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -76,12 +76,6 @@
#include <mntent.h>
#include "busybox.h"
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-
#define MINIX_ROOT_INO 1
#define MINIX_LINK_MAX 250
#define MINIX2_LINK_MAX 65530
@@ -108,13 +102,13 @@ typedef unsigned int u32;
* Note the 8-bit gid and atime and ctime.
*/
struct minix_inode {
- u16 i_mode;
- u16 i_uid;
- u32 i_size;
- u32 i_time;
- u8 i_gid;
- u8 i_nlinks;
- u16 i_zone[9];
+ 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];
};
/*
@@ -124,35 +118,35 @@ struct minix_inode {
* now 16-bit. The inode is now 64 bytes instead of 32.
*/
struct minix2_inode {
- u16 i_mode;
- u16 i_nlinks;
- u16 i_uid;
- u16 i_gid;
- u32 i_size;
- u32 i_atime;
- u32 i_mtime;
- u32 i_ctime;
- u32 i_zone[10];
+ 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];
};
/*
* minix super-block data on disk
*/
struct minix_super_block {
- u16 s_ninodes;
- u16 s_nzones;
- u16 s_imap_blocks;
- u16 s_zmap_blocks;
- u16 s_firstdatazone;
- u16 s_log_zone_size;
- u32 s_max_size;
- u16 s_magic;
- u16 s_state;
- u32 s_zones;
+ 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;
};
struct minix_dir_entry {
- u16 inode;
+ u_int16_t inode;
char name[0];
};