Changeset f4d5f90 in mainline for uspace/srv/fs/exfat/exfat_directory.c
- Timestamp:
- 2011-12-15T10:36:34Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9fe4db3
- Parents:
- d9f8dd13 (diff), 9916841 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/exfat/exfat_directory.c
rd9f8dd13 rf4d5f90 112 112 rc = block_put(di->b); 113 113 di->b = NULL; 114 if (rc != EOK) 115 return rc; 114 116 } 115 117 if (!di->b) { … … 266 268 if (idx == 2 || idx == 3) 267 269 continue; 268 checksum = ((checksum << 15) | (checksum >> 1)) + (uint16_t)bytes[idx]; 270 checksum = ((checksum << 15) | (checksum >> 1)) + 271 (uint16_t)bytes[idx]; 269 272 } 270 273 return checksum; … … 310 313 array[1].stream.valid_data_size = host2uint64_t_le(ds->valid_data_size); 311 314 array[1].stream.data_size = host2uint64_t_le(ds->data_size); 312 array[0].file.checksum = host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array, 315 array[0].file.checksum = 316 host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array, 313 317 count * sizeof(exfat_dentry_t))); 314 318 … … 352 356 uctablep = EXFAT_NODE(fn); 353 357 354 uctable_chars = ALIGN_DOWN(uctablep->size, sizeof(uint16_t)) / sizeof(uint16_t); 358 uctable_chars = ALIGN_DOWN(uctablep->size, 359 sizeof(uint16_t)) / sizeof(uint16_t); 355 360 uctable = (uint16_t *) malloc(uctable_chars * sizeof(uint16_t)); 356 361 rc = exfat_read_uctable(di->bs, uctablep, (uint8_t *)uctable); … … 417 422 return rc; 418 423 419 if (i == df.file.count - 2) 420 chars = ds.stream.name_size - EXFAT_NAME_PART_LEN*(df.file.count - 2); 424 if (i == df.file.count - 2) { 425 chars = ds.stream.name_size - 426 EXFAT_NAME_PART_LEN*(df.file.count - 2); 427 } 428 421 429 rc = exfat_directory_get(di, &de); 422 430 if (rc != EOK)
Note:
See TracChangeset
for help on using the changeset viewer.