Changeset fcce9e1 in mainline
- Timestamp:
- 2011-03-18T18:47:16Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8b86ed26
- Parents:
- cfff7a8f
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/mkminix/mkminix.c
rcfff7a8f rfcce9e1 57 57 58 58 #define UPPER(n, size) (((n) / (size)) + (((n) % (size)) != 0)) 59 #define NEXT_DENTRY(p, dirsize) (p += dirsize)59 #define NEXT_DENTRY(p, dirsize) (p += (dirsize)) 60 60 61 61 typedef enum { … … 161 161 sb.block_size = MFS_MAX_BLOCKSIZE; 162 162 sb.dirsize = MFS3_DIRSIZE; 163 sb.ino_per_block = V3_INODES_PER_BLOCK(sb.block_size); 163 164 break; 164 165 case 'b': … … 285 286 { 286 287 void *root_block; 288 uint8_t *dentry_ptr; 287 289 int rc; 288 290 const long root_dblock = sb->first_data_zone; … … 293 295 if (!root_block) 294 296 return ENOMEM; 297 298 dentry_ptr = root_block; 295 299 296 300 if (sb->fs_version != 3) { … … 301 305 memcpy(dentry->d_name, ".\0", 2); 302 306 303 NEXT_DENTRY(dentry, sb->dirsize); 307 dentry = (struct mfs_dentry *) NEXT_DENTRY(dentry_ptr, 308 sb->dirsize); 304 309 305 310 dentry->d_inum = MFS_ROOT_INO; … … 312 317 memcpy(dentry->d_name, ".\0", 2); 313 318 314 NEXT_DENTRY(dentry, sb->dirsize); 319 dentry = (struct mfs3_dentry *) NEXT_DENTRY(dentry_ptr, 320 sb->dirsize); 315 321 316 322 dentry->d_inum = MFS_ROOT_INO;
Note:
See TracChangeset
for help on using the changeset viewer.