Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-23 00:30:17 +00:00
Code Issues Projects Releases Wiki Activity

Move some "char *"to "const char *", and avoid unnecessary c_str(). (PR #973)

Browse Source
This commit is contained in:
Andrea 2021-07-25 11:55:25 +01:00 committed by GitHub
parent 71bea52419
commit 4375418506
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/CmdLine.h
View File

@ -54,9 +54,9 @@ struct CmdLine
bool bSwapButtons0and1; bool bSwapButtons0and1;
bool bRemoveNoSlotClock; bool bRemoveNoSlotClock;
SS_CARDTYPE slotInsert[NUM_SLOTS]; SS_CARDTYPE slotInsert[NUM_SLOTS];
LPSTR szImageName_drive[NUM_SLOTS][NUM_DRIVES]; LPCSTR szImageName_drive[NUM_SLOTS][NUM_DRIVES];
bool driveConnected[NUM_SLOTS][NUM_DRIVES]; bool driveConnected[NUM_SLOTS][NUM_DRIVES];
LPSTR szImageName_harddisk[NUM_HARDDISKS]; LPCSTR szImageName_harddisk[NUM_HARDDISKS];
LPSTR szSnapshotName; LPSTR szSnapshotName;
LPSTR szScreenshotFilename; LPSTR szScreenshotFilename;
UINT uRamWorksExPages; UINT uRamWorksExPages;

2
source/Disk.cpp
View File

@ -2057,7 +2057,7 @@ bool Disk2InterfaceCard::LoadSnapshotFloppy(YamlLoadHelper& yamlLoadHelper, UINT
bImageError = (dwAttributes == INVALID_FILE_ATTRIBUTES); bImageError = (dwAttributes == INVALID_FILE_ATTRIBUTES);
if (!bImageError) if (!bImageError)
{ {
if (InsertDisk(unit, filename.c_str(), dwAttributes & FILE_ATTRIBUTE_READONLY, IMAGE_DONT_CREATE) != eIMAGE_ERROR_NONE) if (InsertDisk(unit, filename, dwAttributes & FILE_ATTRIBUTE_READONLY, IMAGE_DONT_CREATE) != eIMAGE_ERROR_NONE)
bImageError = true; bImageError = true;
// InsertDisk() zeros m_floppyDrive[unit], then sets up: // InsertDisk() zeros m_floppyDrive[unit], then sets up:

2
source/Harddisk.cpp
View File

@ -859,7 +859,7 @@ static bool HD_LoadSnapshotHDDUnit(YamlLoadHelper& yamlLoadHelper, UINT unit)
return bResSelectImage; return bResSelectImage;
} }
bool HD_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version, const std::string strSaveStatePath) bool HD_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version, const std::string & strSaveStatePath)
{ {
if (slot != 7) // fixme if (slot != 7) // fixme
throw std::string("Card: wrong slot"); throw std::string("Card: wrong slot");

2
source/Harddisk.h
View File

@ -55,4 +55,4 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
std::string HD_GetSnapshotCardName(void); std::string HD_GetSnapshotCardName(void);
void HD_SaveSnapshot(class YamlSaveHelper& yamlSaveHelper); void HD_SaveSnapshot(class YamlSaveHelper& yamlSaveHelper);
bool HD_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version, const std::string strSaveStatePath); bool HD_LoadSnapshot(class YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version, const std::string & strSaveStatePath);

10
source/Utilities.cpp
View File

@ -336,7 +336,7 @@ static std::string GetFullPath(LPCSTR szFileName)
return strPathName; return strPathName;
} }
static void SetCurrentDir(std::string pathname) static void SetCurrentDir(const std::string & pathname)
{ {
// Due to the order HDDs/disks are inserted, then s7 insertions take priority over s6 & s5; and d2 takes priority over d1: // Due to the order HDDs/disks are inserted, then s7 insertions take priority over s6 & s5; and d2 takes priority over d1:
// . if -s6[dN] and -hN are specified, then g_sCurrentDir will be set to the HDD image's path // . if -s6[dN] and -hN are specified, then g_sCurrentDir will be set to the HDD image's path
@ -362,7 +362,7 @@ static bool DoDiskInsert(const UINT slot, const int nDrive, LPCSTR szFileName)
std::string strPathName = GetFullPath(szFileName); std::string strPathName = GetFullPath(szFileName);
if (strPathName.empty()) return false; if (strPathName.empty()) return false;
ImageError_e Error = disk2Card.InsertDisk(nDrive, strPathName.c_str(), IMAGE_USE_FILES_WRITE_PROTECT_STATUS, IMAGE_DONT_CREATE); ImageError_e Error = disk2Card.InsertDisk(nDrive, strPathName, IMAGE_USE_FILES_WRITE_PROTECT_STATUS, IMAGE_DONT_CREATE);
bool res = (Error == eIMAGE_ERROR_NONE); bool res = (Error == eIMAGE_ERROR_NONE);
if (res) if (res)
SetCurrentDir(strPathName); SetCurrentDir(strPathName);
@ -380,14 +380,14 @@ static bool DoHardDiskInsert(const int nDrive, LPCSTR szFileName)
std::string strPathName = GetFullPath(szFileName); std::string strPathName = GetFullPath(szFileName);
if (strPathName.empty()) return false; if (strPathName.empty()) return false;
BOOL bRes = HD_Insert(nDrive, strPathName.c_str()); BOOL bRes = HD_Insert(nDrive, strPathName);
bool res = (bRes == TRUE); bool res = (bRes == TRUE);
if (res) if (res)
SetCurrentDir(strPathName); SetCurrentDir(strPathName);
return res; return res;
} }
void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], bool driveConnected[NUM_DRIVES], bool& bBoot) void InsertFloppyDisks(const UINT slot, LPCSTR szImageName_drive[NUM_DRIVES], bool driveConnected[NUM_DRIVES], bool& bBoot)
{ {
_ASSERT(slot == 5 || slot == 6); _ASSERT(slot == 5 || slot == 6);
@ -419,7 +419,7 @@ void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], boo
GetFrame().FrameMessageBox("Failed to insert floppy disk(s) - see log file", "Warning", MB_ICONASTERISK | MB_OK); GetFrame().FrameMessageBox("Failed to insert floppy disk(s) - see log file", "Warning", MB_ICONASTERISK | MB_OK);
} }
void InsertHardDisks(LPSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot) void InsertHardDisks(LPCSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot)
{ {
if (!szImageName_harddisk[HARDDISK_1] && !szImageName_harddisk[HARDDISK_2]) if (!szImageName_harddisk[HARDDISK_1] && !szImageName_harddisk[HARDDISK_2])
return; return;

4
source/Utilities.h
View File

@ -5,8 +5,8 @@
void LoadConfiguration(); void LoadConfiguration();
void InsertFloppyDisks(const UINT slot, LPSTR szImageName_drive[NUM_DRIVES], bool driveConnected[NUM_DRIVES], bool& bBoot); void InsertFloppyDisks(const UINT slot, LPCSTR szImageName_drive[NUM_DRIVES], bool driveConnected[NUM_DRIVES], bool& bBoot);
void InsertHardDisks(LPSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot); void InsertHardDisks(LPCSTR szImageName_harddisk[NUM_HARDDISKS], bool& bBoot);
void UnplugHardDiskControllerCard(void); void UnplugHardDiskControllerCard(void);
void GetAppleWindowTitle(); void GetAppleWindowTitle();