valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Use C++ pointer-type casting to be more explicit

Browse source 
The prior C-style casts are ambiguous when it comes to
describing what type of cast is being performed. In
this case, we're changing the undering the pointer type
(from an unsigned char * to a char *), which a simple
static_cast<...> cannot do.
This commit is contained in:
kcgen 2020-05-01 07:52:34 -07:00 • committed by Patryk Obara
parent e603337c17
commit e8acb7f0d7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dos/drive_iso.cpp
View file

@ -477,8 +477,10 @@ int isoDrive :: readDirEntry(isoDirEntry *de, Bit8u *data) {
// modify file identifier for use with dosbox
if ((de->length < 33 + de->fileIdentLength)) return -1;
if (IS_DIR(FLAGS2)) {
if (de->fileIdentLength == 1 && de->ident[0] == 0) strcpy((char*)de->ident, ".");
else if (de->fileIdentLength == 1 && de->ident[0] == 1) strcpy((char*)de->ident, "..");
if (de->fileIdentLength == 1 && de->ident[0] == 0)
strcpy(reinterpret_cast<char *>(de->ident), ".");
else if (de->fileIdentLength == 1 && de->ident[0] == 1)
strcpy(reinterpret_cast<char *>(de->ident), "..");
else {
if (de->fileIdentLength > 200) return -1;
de->ident[de->fileIdentLength] = 0;
@ -498,7 +500,7 @@ int isoDrive :: readDirEntry(isoDirEntry *de, Bit8u *data) {
if (dotpos!=NULL) {
if (strlen(dotpos)>4) dotpos[4]=0;
if (dotpos-(char*)de->ident>8) {
strcpy((char*)(&de->ident[8]),dotpos);
strcpy(reinterpret_cast<char *>(&de->ident[8]), dotpos);
}
} else if (strlen((char*)de->ident)>8) de->ident[8]=0;
return de->length;