aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-01-30 22:40:05 +0000
committerEric Andersen <andersen@codepoet.org>2004-01-30 22:40:05 +0000
commit39cdf4e2ab484fd3173ea43a2a882f569c7f01e8 (patch)
treec293559cc7a35a2975860facf9d711ebcee78f36 /util-linux
parentad84a516bb825f987d7d5c2e05270449fb408c04 (diff)
downloadbusybox-w32-39cdf4e2ab484fd3173ea43a2a882f569c7f01e8.tar.gz
busybox-w32-39cdf4e2ab484fd3173ea43a2a882f569c7f01e8.tar.bz2
busybox-w32-39cdf4e2ab484fd3173ea43a2a882f569c7f01e8.zip
Use proper C99 types
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mkfs_minix.c55
1 files changed, 28 insertions, 27 deletions
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 767f998cc..0f72b3592 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -70,6 +70,7 @@
70#include <fcntl.h> 70#include <fcntl.h>
71#include <ctype.h> 71#include <ctype.h>
72#include <stdlib.h> 72#include <stdlib.h>
73#include <stdint.h>
73#include <termios.h> 74#include <termios.h>
74#include <sys/ioctl.h> 75#include <sys/ioctl.h>
75#include <sys/param.h> 76#include <sys/param.h>
@@ -102,13 +103,13 @@
102 * Note the 8-bit gid and atime and ctime. 103 * Note the 8-bit gid and atime and ctime.
103 */ 104 */
104struct minix_inode { 105struct minix_inode {
105 u_int16_t i_mode; 106 uint16_t i_mode;
106 u_int16_t i_uid; 107 uint16_t i_uid;
107 u_int32_t i_size; 108 uint32_t i_size;
108 u_int32_t i_time; 109 uint32_t i_time;
109 u_int8_t i_gid; 110 uint8_t i_gid;
110 u_int8_t i_nlinks; 111 uint8_t i_nlinks;
111 u_int16_t i_zone[9]; 112 uint16_t i_zone[9];
112}; 113};
113 114
114/* 115/*
@@ -118,35 +119,35 @@ struct minix_inode {
118 * now 16-bit. The inode is now 64 bytes instead of 32. 119 * now 16-bit. The inode is now 64 bytes instead of 32.
119 */ 120 */
120struct minix2_inode { 121struct minix2_inode {
121 u_int16_t i_mode; 122 uint16_t i_mode;
122 u_int16_t i_nlinks; 123 uint16_t i_nlinks;
123 u_int16_t i_uid; 124 uint16_t i_uid;
124 u_int16_t i_gid; 125 uint16_t i_gid;
125 u_int32_t i_size; 126 uint32_t i_size;
126 u_int32_t i_atime; 127 uint32_t i_atime;
127 u_int32_t i_mtime; 128 uint32_t i_mtime;
128 u_int32_t i_ctime; 129 uint32_t i_ctime;
129 u_int32_t i_zone[10]; 130 uint32_t i_zone[10];
130}; 131};
131 132
132/* 133/*
133 * minix super-block data on disk 134 * minix super-block data on disk
134 */ 135 */
135struct minix_super_block { 136struct minix_super_block {
136 u_int16_t s_ninodes; 137 uint16_t s_ninodes;
137 u_int16_t s_nzones; 138 uint16_t s_nzones;
138 u_int16_t s_imap_blocks; 139 uint16_t s_imap_blocks;
139 u_int16_t s_zmap_blocks; 140 uint16_t s_zmap_blocks;
140 u_int16_t s_firstdatazone; 141 uint16_t s_firstdatazone;
141 u_int16_t s_log_zone_size; 142 uint16_t s_log_zone_size;
142 u_int32_t s_max_size; 143 uint32_t s_max_size;
143 u_int16_t s_magic; 144 uint16_t s_magic;
144 u_int16_t s_state; 145 uint16_t s_state;
145 u_int32_t s_zones; 146 uint32_t s_zones;
146}; 147};
147 148
148struct minix_dir_entry { 149struct minix_dir_entry {
149 u_int16_t inode; 150 uint16_t inode;
150 char name[0]; 151 char name[0];
151}; 152};
152 153