Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CDFS]

Browse source 
Prevent code duplication by making CdfsGetEntryName() call CdfsGetDirEntryName() which is now available driver-wide

svn path=/trunk/; revision=68242
This commit is contained in:
Pierre Schweitzer 2015-06-22 18:42:56 +00:00
parent d958941422
commit 1b62b46a8f
4 changed files with 43 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/drivers/filesystems/cdfs/cdfs.h
View file

@ -484,6 +484,11 @@ BOOLEAN
CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt, CdfsIsRecordValid(IN PDEVICE_EXTENSION DeviceExt,
IN PDIR_RECORD Record); IN PDIR_RECORD Record);
VOID
CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
PDIR_RECORD Record,
PWSTR Name);
/* rw.c */ /* rw.c */
NTSTATUS NTSTATUS

26
reactos/drivers/filesystems/cdfs/dirctl.c
View file

@ -117,31 +117,7 @@ CdfsGetEntryName(PDEVICE_EXTENSION DeviceExt,
DPRINT("Index %lu RecordLength %lu Offset %lu\n", DPRINT("Index %lu RecordLength %lu Offset %lu\n",
*pIndex, Record->RecordLength, *CurrentOffset); *pIndex, Record->RecordLength, *CurrentOffset);
if (Record->FileIdLength == 1 && Record->FileId[0] == 0) CdfsGetDirEntryName(DeviceExt, Record, Name);
{
wcscpy(Name, L".");
}
else if (Record->FileIdLength == 1 && Record->FileId[0] == 1)
{
wcscpy(Name, L"..");
}
else
{
if (DeviceExt->CdInfo.JolietLevel == 0)
{
ULONG i;
for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++)
Name[i] = (WCHAR)Record->FileId[i];
Name[i] = 0;
}
else
{
CdfsSwapString(Name, Record->FileId, Record->FileIdLength);
}
}
DPRINT("Name '%S'\n", Name);
*Ptr = Record; *Ptr = Record;

38
reactos/drivers/filesystems/cdfs/fcb.c
View file

@ -326,44 +326,6 @@ CdfsOpenRootFCB(PDEVICE_EXTENSION Vcb)
} }
static VOID
CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
PDIR_RECORD Record,
PWSTR Name)
/*
* FUNCTION: Retrieves the file name from a directory record.
*/
{
if (Record->FileIdLength == 1 && Record->FileId[0] == 0)
{
wcscpy(Name, L".");
}
else if (Record->FileIdLength == 1 && Record->FileId[0] == 1)
{
wcscpy(Name, L"..");
}
else
{
if (DeviceExt->CdInfo.JolietLevel == 0)
{
ULONG i;
for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++)
Name[i] = (WCHAR)Record->FileId[i];
Name[i] = 0;
}
else
{
CdfsSwapString(Name,
Record->FileId,
Record->FileIdLength);
}
}
DPRINT("Name '%S'\n", Name);
}
NTSTATUS NTSTATUS
CdfsMakeFCBFromDirEntry(PVCB Vcb, CdfsMakeFCBFromDirEntry(PVCB Vcb,
PFCB DirectoryFCB, PFCB DirectoryFCB,

37
reactos/drivers/filesystems/cdfs/misc.c
View file

@ -346,4 +346,41 @@ CdfsShortNameCacheGet
DPRINT("Returning short name %wZ for long name %wZ\n", ShortName, LongName); DPRINT("Returning short name %wZ for long name %wZ\n", ShortName, LongName);
} }
VOID
CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt,
PDIR_RECORD Record,
PWSTR Name)
/*
* FUNCTION: Retrieves the file name from a directory record.
*/
{
if (Record->FileIdLength == 1 && Record->FileId[0] == 0)
{
wcscpy(Name, L".");
}
else if (Record->FileIdLength == 1 && Record->FileId[0] == 1)
{
wcscpy(Name, L"..");
}
else
{
if (DeviceExt->CdInfo.JolietLevel == 0)
{
ULONG i;
for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++)
Name[i] = (WCHAR)Record->FileId[i];
Name[i] = 0;
}
else
{
CdfsSwapString(Name,
Record->FileId,
Record->FileIdLength);
}
}
DPRINT("Name '%S'\n", Name);
}
/* EOF */ /* EOF */