diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-08-29 19:02:26 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-08-29 19:02:26 +0000 |
| commit | dcbca62e89a46788de4b32ba3b2a4b5cd725e430 (patch) | |
| tree | 8625e627265130f72a02982cbb3c1e7642f1221c /util-linux/mkfs_minix.c | |
| parent | 507891998164b8548f5aebfc54e759a3fbbd3bde (diff) | |
| download | busybox-w32-dcbca62e89a46788de4b32ba3b2a4b5cd725e430.tar.gz busybox-w32-dcbca62e89a46788de4b32ba3b2a4b5cd725e430.tar.bz2 busybox-w32-dcbca62e89a46788de4b32ba3b2a4b5cd725e430.zip | |
Standard typing (u_int16_t instead of u16, u_int32_t instead
of u32, etc) cleanups from Laurence Anderson <laurence@zxmail.com>
Diffstat (limited to 'util-linux/mkfs_minix.c')
| -rw-r--r-- | util-linux/mkfs_minix.c | 60 |
1 files changed, 27 insertions, 33 deletions
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 @@ | |||
| 76 | #include <mntent.h> | 76 | #include <mntent.h> |
| 77 | #include "busybox.h" | 77 | #include "busybox.h" |
| 78 | 78 | ||
| 79 | |||
| 80 | typedef unsigned char u8; | ||
| 81 | typedef unsigned short u16; | ||
| 82 | typedef unsigned int u32; | ||
| 83 | |||
| 84 | |||
| 85 | #define MINIX_ROOT_INO 1 | 79 | #define MINIX_ROOT_INO 1 |
| 86 | #define MINIX_LINK_MAX 250 | 80 | #define MINIX_LINK_MAX 250 |
| 87 | #define MINIX2_LINK_MAX 65530 | 81 | #define MINIX2_LINK_MAX 65530 |
| @@ -108,13 +102,13 @@ typedef unsigned int u32; | |||
| 108 | * Note the 8-bit gid and atime and ctime. | 102 | * Note the 8-bit gid and atime and ctime. |
| 109 | */ | 103 | */ |
| 110 | struct minix_inode { | 104 | struct minix_inode { |
| 111 | u16 i_mode; | 105 | u_int16_t i_mode; |
| 112 | u16 i_uid; | 106 | u_int16_t i_uid; |
| 113 | u32 i_size; | 107 | u_int32_t i_size; |
| 114 | u32 i_time; | 108 | u_int32_t i_time; |
| 115 | u8 i_gid; | 109 | u_int8_t i_gid; |
| 116 | u8 i_nlinks; | 110 | u_int8_t i_nlinks; |
| 117 | u16 i_zone[9]; | 111 | u_int16_t i_zone[9]; |
| 118 | }; | 112 | }; |
| 119 | 113 | ||
| 120 | /* | 114 | /* |
| @@ -124,35 +118,35 @@ struct minix_inode { | |||
| 124 | * now 16-bit. The inode is now 64 bytes instead of 32. | 118 | * now 16-bit. The inode is now 64 bytes instead of 32. |
| 125 | */ | 119 | */ |
| 126 | struct minix2_inode { | 120 | struct minix2_inode { |
| 127 | u16 i_mode; | 121 | u_int16_t i_mode; |
| 128 | u16 i_nlinks; | 122 | u_int16_t i_nlinks; |
| 129 | u16 i_uid; | 123 | u_int16_t i_uid; |
| 130 | u16 i_gid; | 124 | u_int16_t i_gid; |
| 131 | u32 i_size; | 125 | u_int32_t i_size; |
| 132 | u32 i_atime; | 126 | u_int32_t i_atime; |
| 133 | u32 i_mtime; | 127 | u_int32_t i_mtime; |
| 134 | u32 i_ctime; | 128 | u_int32_t i_ctime; |
| 135 | u32 i_zone[10]; | 129 | u_int32_t i_zone[10]; |
| 136 | }; | 130 | }; |
| 137 | 131 | ||
| 138 | /* | 132 | /* |
| 139 | * minix super-block data on disk | 133 | * minix super-block data on disk |
| 140 | */ | 134 | */ |
| 141 | struct minix_super_block { | 135 | struct minix_super_block { |
| 142 | u16 s_ninodes; | 136 | u_int16_t s_ninodes; |
| 143 | u16 s_nzones; | 137 | u_int16_t s_nzones; |
| 144 | u16 s_imap_blocks; | 138 | u_int16_t s_imap_blocks; |
| 145 | u16 s_zmap_blocks; | 139 | u_int16_t s_zmap_blocks; |
| 146 | u16 s_firstdatazone; | 140 | u_int16_t s_firstdatazone; |
| 147 | u16 s_log_zone_size; | 141 | u_int16_t s_log_zone_size; |
| 148 | u32 s_max_size; | 142 | u_int32_t s_max_size; |
| 149 | u16 s_magic; | 143 | u_int16_t s_magic; |
| 150 | u16 s_state; | 144 | u_int16_t s_state; |
| 151 | u32 s_zones; | 145 | u_int32_t s_zones; |
| 152 | }; | 146 | }; |
| 153 | 147 | ||
| 154 | struct minix_dir_entry { | 148 | struct minix_dir_entry { |
| 155 | u16 inode; | 149 | u_int16_t inode; |
| 156 | char name[0]; | 150 | char name[0]; |
| 157 | }; | 151 | }; |
| 158 | 152 | ||