i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix some identation. No functional changes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27102 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-08-21 11:46:15 +00:00
parent 4f2d40ec1b
commit 67a6ba1c21
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/udf/Recognition.cpp
+24 -27
View File
@@ -12,25 +12,26 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static status_t static status_t
walk_volume_recognition_sequence(int device, off_t offset, walk_volume_recognition_sequence(int device, off_t offset, uint32 blockSize,
uint32 blockSize, uint32 blockShift);
uint32 blockShift);
static status_t static status_t
walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length, walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
uint32 blockSize, uint32 blockShift, uint32 blockSize, uint32 blockShift,
logical_volume_descriptor &logicalVolumeDescriptor, logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[], partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount); uint8 &partitionDescriptorCount);
static status_t static status_t
walk_volume_descriptor_sequence(extent_address descriptorSequence, walk_volume_descriptor_sequence(extent_address descriptorSequence, int device,
int device, uint32 blockSize, uint32 blockShift, uint32 blockSize, uint32 blockShift,
logical_volume_descriptor &logicalVolumeDescriptor, logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[], partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount); uint8 &partitionDescriptorCount);
static status_t static status_t
walk_integrity_sequence(int device, uint32 blockSize, uint32 blockShift, walk_integrity_sequence(int device, uint32 blockSize, uint32 blockShift,
extent_address descriptorSequence, uint32 sequenceNumber = 0); extent_address descriptorSequence, uint32 sequenceNumber = 0);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// externally visible functions // externally visible functions
@@ -65,8 +66,8 @@ udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
// Now hunt down a volume descriptor sequence from one of // Now hunt down a volume descriptor sequence from one of
// the anchor volume pointers (if there are any). // the anchor volume pointers (if there are any).
status = walk_anchor_volume_descriptor_sequences(device, offset, length, status = walk_anchor_volume_descriptor_sequences(device, offset, length,
blockSize, blockShift, logicalVolumeDescriptor, blockSize, blockShift, logicalVolumeDescriptor, partitionDescriptors,
partitionDescriptors, partitionDescriptorCount); partitionDescriptorCount);
if (status != B_OK) { if (status != B_OK) {
TRACE_ERROR(("udf_recognize: cannot find volume descriptor. status = %d\n", TRACE_ERROR(("udf_recognize: cannot find volume descriptor. status = %d\n",
status)); status));
@@ -163,26 +164,22 @@ walk_volume_recognition_sequence(int device, off_t offset, uint32 blockSize,
static static
status_t status_t
walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length, walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
uint32 blockSize, uint32 blockShift, uint32 blockSize, uint32 blockShift,
logical_volume_descriptor &logicalVolumeDescriptor, logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[], partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount) uint8 &partitionDescriptorCount)
{ {
DEBUG_INIT(NULL); DEBUG_INIT(NULL);
const uint8 avds_location_count = 4; const uint8 avds_location_count = 4;
const off_t avds_locations[avds_location_count] = { const off_t avds_locations[avds_location_count]
256, = { 256, length-1-256, length-1, 512, };
length-1-256,
length-1,
512,
};
bool found_vds = false; bool found_vds = false;
for (int32 i = 0; i < avds_location_count; i++) { for (int32 i = 0; i < avds_location_count; i++) {
off_t block = avds_locations[i]; off_t block = avds_locations[i];
off_t address = (offset + block) << blockShift; off_t address = (offset + block) << blockShift;
MemoryChunk chunk(blockSize); MemoryChunk chunk(blockSize);
anchor_volume_descriptor *anchor = NULL; anchor_volume_descriptor *anchor = NULL;
status_t anchorErr = chunk.InitCheck(); status_t anchorErr = chunk.InitCheck();
if (!anchorErr) { if (!anchorErr) {
ssize_t bytesRead = read_pos(device, address, chunk.Data(), blockSize); ssize_t bytesRead = read_pos(device, address, chunk.Data(), blockSize);