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

Renamed {primary,logical,anchor}_descriptor structs to more

Browse Source 
accurately be {primary,logical,anchor}_volume_descriptor.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5475 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Tyler Dauwalder
2003-11-25 00:23:16 +00:00
parent 1379caca11
commit 9b8775ea74
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/udf/DiskStructures.cpp
+10 -10
View File
@@ -265,13 +265,13 @@ descriptor_tag ::init_check(uint32 diskBlock)
//----------------------------------------------------------------------
// primary_descriptor
// primary_volume_descriptor
//----------------------------------------------------------------------
void
primary_descriptor::dump() const
primary_volume_descriptor::dump() const
{
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "primary_descriptor");
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "primary_volume_descriptor");
CS0String string;
@@ -313,9 +313,9 @@ primary_descriptor::dump() const
//----------------------------------------------------------------------
void
anchor_descriptor::dump() const
anchor_volume_descriptor::dump() const
{
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "anchor_descriptor");
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "anchor_volume_descriptor");
PRINT(("tag:\n"));
DUMP(tag());
PRINT(("main_vds:\n"));
@@ -372,13 +372,13 @@ partition_descriptor::dump() const
}
//----------------------------------------------------------------------
// logical_descriptor
// logical_volume_descriptor
//----------------------------------------------------------------------
void
logical_descriptor::dump() const
logical_volume_descriptor::dump() const
{
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "logical_descriptor");
DUMP_INIT(CF_PUBLIC | CF_VOLUME_OPS | CF_DUMP, "logical_volume_descriptor");
PRINT(("tag:\n"));
DUMP(tag());
PRINT(("vds_number: %ld\n", vds_number()));
@@ -430,8 +430,8 @@ logical_descriptor::dump() const
}
logical_descriptor&
logical_descriptor::operator=(const logical_descriptor &rhs)
logical_volume_descriptor&
logical_volume_descriptor::operator=(const logical_volume_descriptor &rhs)
{
_tag = rhs._tag;
_vds_number = rhs._vds_number;
src/add-ons/kernel/file_systems/udf/DiskStructures.h
+5 -5
View File
@@ -505,7 +505,7 @@ const char *tag_id_to_string(tag_id id);
/*! \brief Primary volume descriptor
*/
struct primary_descriptor {
struct primary_volume_descriptor {
public:
void dump() const;
@@ -633,7 +633,7 @@ private:
See also: ECMA 167 3/10.2, UDF-2.01 2.2.3
*/
struct anchor_descriptor {
struct anchor_volume_descriptor {
public:
void dump() const;
@@ -804,7 +804,7 @@ enum partition_access_type {
See also: ECMA 167 3/10.6, UDF-2.01 2.2.4
*/
struct logical_descriptor {
struct logical_volume_descriptor {
void dump() const;
// Get functions
@@ -853,7 +853,7 @@ struct logical_descriptor {
void set_partition_map_count(uint32 count) { _partition_map_count = B_HOST_TO_LENDIAN_INT32(count); }
// Other functions
logical_descriptor& operator=(const logical_descriptor &rhs);
logical_volume_descriptor& operator=(const logical_volume_descriptor &rhs);
private:
descriptor_tag _tag;
@@ -899,7 +899,7 @@ private:
defect management.
Note that we actually allocate memory for the partition maps
here due to the fact that we allocate logical_descriptor
here due to the fact that we allocate logical_volume_descriptor
objects on the stack sometimes.
See UDF-2.01 2.2.8, 2.2.9
src/add-ons/kernel/file_systems/udf/Recognition.cpp
+10 -10
View File
@@ -16,13 +16,13 @@ walk_volume_recognition_sequence(int device, off_t offset,
static status_t
walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
uint32 blockSize, uint32 blockShift,
logical_descriptor &logicalVolumeDescriptor,
logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount);
static status_t
walk_volume_descriptor_sequence(extent_address descriptorSequence,
int device, uint32 blockSize, uint32 blockShift,
logical_descriptor &logicalVolumeDescriptor,
logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount);
@@ -32,7 +32,7 @@ walk_volume_descriptor_sequence(extent_address descriptorSequence,
status_t
Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
uint32 &blockShift, logical_descriptor &logicalVolumeDescriptor,
uint32 &blockShift, logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount)
{
@@ -78,7 +78,7 @@ Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
DEBUG_INIT_ETC(CF_PRIVATE, NULL, ("device: %d, offset: %Ld, length: %Ld, "
"blockSize: %ld, volumeName: %p", device, offset, length,
blockSize, volumeName));
logical_descriptor logicalVolumeDescriptor;
logical_volume_descriptor logicalVolumeDescriptor;
partition_descriptor partitionDescriptors[Udf::kMaxPartitionDescriptors];
uint8 partitionDescriptorCount;
uint32 blockShift;
@@ -166,7 +166,7 @@ static
status_t
walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
uint32 blockSize, uint32 blockShift,
logical_descriptor &logicalVolumeDescriptor,
logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount)
{
@@ -183,7 +183,7 @@ walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
off_t block = avds_locations[i];
off_t address = (offset + block) << blockShift;
MemoryChunk chunk(blockSize);
anchor_descriptor *anchor = NULL;
anchor_volume_descriptor *anchor = NULL;
status_t anchorErr = chunk.InitCheck();
if (!anchorErr) {
@@ -195,7 +195,7 @@ walk_anchor_volume_descriptor_sequences(int device, off_t offset, off_t length,
}
}
if (!anchorErr) {
anchor = reinterpret_cast<anchor_descriptor*>(chunk.Data());
anchor = reinterpret_cast<anchor_volume_descriptor*>(chunk.Data());
anchorErr = anchor->tag().init_check(block+offset);
if (anchorErr) {
PRINT(("block %Ld: invalid anchor\n", block));
@@ -237,7 +237,7 @@ static
status_t
walk_volume_descriptor_sequence(extent_address descriptorSequence,
int device, uint32 blockSize, uint32 blockShift,
logical_descriptor &logicalVolumeDescriptor,
logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount)
{
@@ -279,7 +279,7 @@ walk_volume_descriptor_sequence(extent_address descriptorSequence,
case TAGID_PRIMARY_VOLUME_DESCRIPTOR:
{
primary_descriptor *primary = reinterpret_cast<primary_descriptor*>(tag);
primary_volume_descriptor *primary = reinterpret_cast<primary_volume_descriptor*>(tag);
PDUMP(primary);
(void)primary; // kill the warning
break;
@@ -376,7 +376,7 @@ walk_volume_descriptor_sequence(extent_address descriptorSequence,
case TAGID_LOGICAL_VOLUME_DESCRIPTOR:
{
logical_descriptor *logical = reinterpret_cast<logical_descriptor*>(tag);
logical_volume_descriptor *logical = reinterpret_cast<logical_volume_descriptor*>(tag);
PDUMP(logical);
if (foundLogicalVolumeDescriptor) {
// Keep the vd with the highest vds_number
src/add-ons/kernel/file_systems/udf/Recognition.h
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Udf {
status_t udf_recognize(int device, off_t offset, off_t length,
uint32 blockSize, uint32 &blockShift,
logical_descriptor &logicalVolumeDescriptor,
logical_volume_descriptor &logicalVolumeDescriptor,
partition_descriptor partitionDescriptors[],
uint8 &partitionDescriptorCount);
status_t udf_recognize(int device, off_t offset, off_t length,
src/add-ons/kernel/file_systems/udf/Volume.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
}
}
logical_descriptor logicalVolumeDescriptor;
logical_volume_descriptor logicalVolumeDescriptor;
partition_descriptor partitionDescriptors[Udf::kMaxPartitionDescriptors];
uint8 partitionDescriptorCount;
uint32 blockShift;