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

* Removed udf_recognize as it has been moved to kernel_interface.cpp

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27026 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-08-18 10:11:44 +00:00
parent 7d6edec63d
commit 375d5b5d0c
2 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/udf/Recognition.cpp
+4 -25
View File
@@ -4,7 +4,8 @@
#include "MemoryChunk.h" #include "MemoryChunk.h"
#include "Utils.h" #include "Utils.h"
using namespace Udf; #include <string.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// forward declarations // forward declarations
@@ -36,7 +37,7 @@ walk_integrity_sequence(int device, uint32 blockSize, uint32 blockShift,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
status_t status_t
Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize, udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
uint32 &blockShift, logical_volume_descriptor &logicalVolumeDescriptor, uint32 &blockShift, logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[], partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount) uint8 &partitionDescriptorCount)
@@ -76,27 +77,6 @@ Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
RETURN(error); RETURN(error);
} }
status_t
Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
char *volumeName)
{
DEBUG_INIT_ETC(NULL, ("device: %d, offset: %Ld, length: %Ld, "
"blockSize: %ld, volumeName: %p", device, offset, length,
blockSize, volumeName));
logical_volume_descriptor logicalVolumeDescriptor;
partition_descriptor partitionDescriptors[Udf::kMaxPartitionDescriptors];
uint8 partitionDescriptorCount;
uint32 blockShift;
status_t error = udf_recognize(device, offset, length, blockSize, blockShift,
logicalVolumeDescriptor, partitionDescriptors,
partitionDescriptorCount);
if (!error && volumeName) {
String name(logicalVolumeDescriptor.logical_volume_identifier());
strcpy(volumeName, name.Utf8());
}
RETURN(error);
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// local functions // local functions
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -344,7 +324,7 @@ walk_volume_descriptor_sequence(extent_address descriptorSequence,
// If we didn't find a duplicate, see if we have any open descriptor // If we didn't find a duplicate, see if we have any open descriptor
// spaces left. // spaces left.
if (!foundDuplicate) { if (!foundDuplicate) {
if (num < Udf::kMaxPartitionDescriptors) { if (num < kMaxPartitionDescriptors) {
// At least one more partition descriptor allowed // At least one more partition descriptor allowed
partitionDescriptors[num] = *partition; partitionDescriptors[num] = *partition;
uniquePartitions++; uniquePartitions++;
@@ -546,4 +526,3 @@ walk_integrity_sequence(int device, uint32 blockSize, uint32 blockShift,
error = highestMinimumUDFReadRevision <= UDF_MAX_READ_REVISION ? B_OK : B_ERROR; error = highestMinimumUDFReadRevision <= UDF_MAX_READ_REVISION ? B_OK : B_ERROR;
RETURN(error); RETURN(error);
} }
src/add-ons/kernel/file_systems/udf/Recognition.h
-6
View File
@@ -13,16 +13,10 @@
#include "UdfStructures.h" #include "UdfStructures.h"
#include "UdfDebug.h" #include "UdfDebug.h"
namespace Udf {
status_t udf_recognize(int device, off_t offset, off_t length, status_t udf_recognize(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);
status_t udf_recognize(int device, off_t offset, off_t length,
uint32 blockSize, char *volumeName);
} // namespace Udf
#endif // _UDF_RECOGNITION_H #endif // _UDF_RECOGNITION_H