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/fsck_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/fsck_minix.c')
| -rw-r--r-- | util-linux/fsck_minix.c | 60 |
1 files changed, 27 insertions, 33 deletions
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 @@ | |||
| 98 | #include <sys/param.h> | 98 | #include <sys/param.h> |
| 99 | #include "busybox.h" | 99 | #include "busybox.h" |
| 100 | 100 | ||
| 101 | |||
| 102 | typedef unsigned char u8; | ||
| 103 | typedef unsigned short u16; | ||
| 104 | typedef unsigned int u32; | ||
| 105 | |||
| 106 | |||
| 107 | static const int MINIX_ROOT_INO = 1; | 101 | static const int MINIX_ROOT_INO = 1; |
| 108 | static const int MINIX_LINK_MAX = 250; | 102 | static const int MINIX_LINK_MAX = 250; |
| 109 | static const int MINIX2_LINK_MAX = 65530; | 103 | static const int MINIX2_LINK_MAX = 65530; |
| @@ -130,13 +124,13 @@ static const int MINIX_V2 = 0x0002; /* minix V2 fs */ | |||
| 130 | * Note the 8-bit gid and atime and ctime. | 124 | * Note the 8-bit gid and atime and ctime. |
| 131 | */ | 125 | */ |
| 132 | struct minix_inode { | 126 | struct minix_inode { |
| 133 | u16 i_mode; | 127 | u_int16_t i_mode; |
| 134 | u16 i_uid; | 128 | u_int16_t i_uid; |
| 135 | u32 i_size; | 129 | u_int32_t i_size; |
| 136 | u32 i_time; | 130 | u_int32_t i_time; |
| 137 | u8 i_gid; | 131 | u_int8_t i_gid; |
| 138 | u8 i_nlinks; | 132 | u_int8_t i_nlinks; |
| 139 | u16 i_zone[9]; | 133 | u_int16_t i_zone[9]; |
| 140 | }; | 134 | }; |
| 141 | 135 | ||
| 142 | /* | 136 | /* |
| @@ -146,35 +140,35 @@ struct minix_inode { | |||
| 146 | * now 16-bit. The inode is now 64 bytes instead of 32. | 140 | * now 16-bit. The inode is now 64 bytes instead of 32. |
| 147 | */ | 141 | */ |
| 148 | struct minix2_inode { | 142 | struct minix2_inode { |
| 149 | u16 i_mode; | 143 | u_int16_t i_mode; |
| 150 | u16 i_nlinks; | 144 | u_int16_t i_nlinks; |
| 151 | u16 i_uid; | 145 | u_int16_t i_uid; |
| 152 | u16 i_gid; | 146 | u_int16_t i_gid; |
| 153 | u32 i_size; | 147 | u_int32_t i_size; |
| 154 | u32 i_atime; | 148 | u_int32_t i_atime; |
| 155 | u32 i_mtime; | 149 | u_int32_t i_mtime; |
| 156 | u32 i_ctime; | 150 | u_int32_t i_ctime; |
| 157 | u32 i_zone[10]; | 151 | u_int32_t i_zone[10]; |
| 158 | }; | 152 | }; |
| 159 | 153 | ||
| 160 | /* | 154 | /* |
| 161 | * minix super-block data on disk | 155 | * minix super-block data on disk |
| 162 | */ | 156 | */ |
| 163 | struct minix_super_block { | 157 | struct minix_super_block { |
| 164 | u16 s_ninodes; | 158 | u_int16_t s_ninodes; |
| 165 | u16 s_nzones; | 159 | u_int16_t s_nzones; |
| 166 | u16 s_imap_blocks; | 160 | u_int16_t s_imap_blocks; |
| 167 | u16 s_zmap_blocks; | 161 | u_int16_t s_zmap_blocks; |
| 168 | u16 s_firstdatazone; | 162 | u_int16_t s_firstdatazone; |
| 169 | u16 s_log_zone_size; | 163 | u_int16_t s_log_zone_size; |
| 170 | u32 s_max_size; | 164 | u_int32_t s_max_size; |
| 171 | u16 s_magic; | 165 | u_int16_t s_magic; |
| 172 | u16 s_state; | 166 | u_int16_t s_state; |
| 173 | u32 s_zones; | 167 | u_int32_t s_zones; |
| 174 | }; | 168 | }; |
| 175 | 169 | ||
| 176 | struct minix_dir_entry { | 170 | struct minix_dir_entry { |
| 177 | u16 inode; | 171 | u_int16_t inode; |
| 178 | char name[0]; | 172 | char name[0]; |
| 179 | }; | 173 | }; |
| 180 | 174 | ||