claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plat: use size_t for global dir path buffer length

Browse Source
This commit is contained in:
David Hrdlička
2025-05-03 01:41:18 +02:00
parent db842cf545
commit 4b55dc8cae
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/plat.h
View File

@@ -143,8 +143,8 @@ extern int plat_getcwd(char *bufp, int max);
extern int plat_chdir(char *path); extern int plat_chdir(char *path);
extern void plat_tempfile(char *bufp, char *prefix, char *suffix); extern void plat_tempfile(char *bufp, char *prefix, char *suffix);
extern void plat_get_exe_name(char *s, int size); extern void plat_get_exe_name(char *s, int size);
extern void plat_get_global_config_dir(char *outbuf, uint8_t len); extern void plat_get_global_config_dir(char *outbuf, size_t len);
extern void plat_get_global_data_dir(char *outbuf, uint8_t len); extern void plat_get_global_data_dir(char *outbuf, size_t len);
extern void plat_get_temp_dir(char *outbuf, uint8_t len); extern void plat_get_temp_dir(char *outbuf, uint8_t len);
extern void plat_init_rom_paths(void); extern void plat_init_rom_paths(void);
extern int plat_dir_check(char *path); extern int plat_dir_check(char *path);

12
src/qt/qt_platform.cpp
View File

@@ -595,14 +595,14 @@ ProgSettings::reloadStrings()
{ {
translatedstrings.clear(); translatedstrings.clear();
translatedstrings[STRING_MOUSE_CAPTURE] = QCoreApplication::translate("", "Click to capture mouse").toStdWString(); translatedstrings[STRING_MOUSE_CAPTURE] = QCoreApplication::translate("", "Click to capture mouse").toStdWString();
char mouseCaptureKeyseq[100]; char mouseCaptureKeyseq[100];
sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq); sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq);
translatedstrings[STRING_MOUSE_RELEASE] = QString(mouseCaptureKeyseq).toStdWString(); translatedstrings[STRING_MOUSE_RELEASE] = QString(mouseCaptureKeyseq).toStdWString();
sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s or middle button to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq); sprintf(mouseCaptureKeyseq, qPrintable(QCoreApplication::translate("", "Press %s or middle button to release mouse")), acc_keys[FindAccelerator("release_mouse")].seq);
translatedstrings[STRING_MOUSE_RELEASE_MMB] = QString(mouseCaptureKeyseq).toStdWString(); translatedstrings[STRING_MOUSE_RELEASE_MMB] = QString(mouseCaptureKeyseq).toStdWString();
translatedstrings[STRING_INVALID_CONFIG] = QCoreApplication::translate("", "Invalid configuration").toStdWString(); translatedstrings[STRING_INVALID_CONFIG] = QCoreApplication::translate("", "Invalid configuration").toStdWString();
translatedstrings[STRING_NO_ST506_ESDI_CDROM] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString(); translatedstrings[STRING_NO_ST506_ESDI_CDROM] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString();
translatedstrings[STRING_PCAP_ERROR_NO_DEVICES] = QCoreApplication::translate("", "No PCap devices found").toStdWString(); translatedstrings[STRING_PCAP_ERROR_NO_DEVICES] = QCoreApplication::translate("", "No PCap devices found").toStdWString();
@@ -639,7 +639,7 @@ plat_chdir(char *path)
} }
void void
plat_get_global_config_dir(char *outbuf, const uint8_t len) plat_get_global_config_dir(char *outbuf, const size_t len)
{ {
const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppConfigLocation)[0]); const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppConfigLocation)[0]);
if (!dir.exists()) { if (!dir.exists()) {
@@ -651,7 +651,7 @@ plat_get_global_config_dir(char *outbuf, const uint8_t len)
} }
void void
plat_get_global_data_dir(char *outbuf, const uint8_t len) plat_get_global_data_dir(char *outbuf, const size_t len)
{ {
const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)[0]); const auto dir = QDir(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)[0]);
if (!dir.exists()) { if (!dir.exists()) {

4
src/unix/unix.c
View File

@@ -844,7 +844,7 @@ plat_init_rom_paths(void)
} }
void void
plat_get_global_config_dir(char *outbuf, const uint8_t len) plat_get_global_config_dir(char *outbuf, const size_t len)
{ {
char *prefPath = SDL_GetPrefPath(NULL, "86Box"); char *prefPath = SDL_GetPrefPath(NULL, "86Box");
strncpy(outbuf, prefPath, len); strncpy(outbuf, prefPath, len);
@@ -853,7 +853,7 @@ plat_get_global_config_dir(char *outbuf, const uint8_t len)
} }
void void
plat_get_global_data_dir(char *outbuf, const uint8_t len) plat_get_global_data_dir(char *outbuf, const size_t len)
{ {
char *prefPath = SDL_GetPrefPath(NULL, "86Box"); char *prefPath = SDL_GetPrefPath(NULL, "86Box");
strncpy(outbuf, prefPath, len); strncpy(outbuf, prefPath, len);