mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Make const char-char conversions explicit

Browse Source
This commit is contained in:
Michael Steenbeek
2017-12-13 13:24:30 +01:00
parent 1a9975d683
commit 717d71eb24
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/util/Util.cpp
View File

@@ -66,8 +66,8 @@ bool filename_valid_characters(const utf8 *filename)
utf8 *path_get_directory(const utf8 *path) utf8 *path_get_directory(const utf8 *path)
{ {
// Find the last slash or backslash in the path // Find the last slash or backslash in the path
char *filename = strrchr(path, *PATH_SEPARATOR); char * filename = (char *)strrchr(path, *PATH_SEPARATOR);
char *filename_posix = strrchr(path, '/'); char * filename_posix = (char *)strrchr(path, '/');
filename = filename < filename_posix ? filename_posix : filename; filename = filename < filename_posix ? filename_posix : filename;
// If the path is invalid (e.g. just a file name), return NULL // If the path is invalid (e.g. just a file name), return NULL
@@ -84,8 +84,8 @@ utf8 *path_get_directory(const utf8 *path)
const char *path_get_filename(const utf8 *path) const char *path_get_filename(const utf8 *path)
{ {
// Find last slash or backslash in the path // Find last slash or backslash in the path
char *filename = strrchr(path, *PATH_SEPARATOR); char * filename = (char *)strrchr(path, *PATH_SEPARATOR);
char *filename_posix = strchr(path, '/'); char * filename_posix = (char *)strchr(path, '/');
filename = filename < filename_posix ? filename_posix : filename; filename = filename < filename_posix ? filename_posix : filename;
// Checks if the path is valid (e.g. not just a file name) // Checks if the path is valid (e.g. not just a file name)
@@ -109,11 +109,11 @@ const char *path_get_extension(const utf8 *path)
const char *filename = path_get_filename(path); const char *filename = path_get_filename(path);
// Try to find the most-right dot in the filename // Try to find the most-right dot in the filename
char *extension = strrchr(filename, '.'); char * extension = (char *)strrchr(filename, '.');
// When no dot was found, return a pointer to the null-terminator // When no dot was found, return a pointer to the null-terminator
if (extension == NULL) if (extension == NULL)
extension = strrchr(filename, '\0'); extension = (char *)strrchr(filename, '\0');
return extension; return extension;
} }
@@ -140,7 +140,7 @@ void path_append_extension(utf8 *path, const utf8 *newExtension, size_t size)
void path_remove_extension(utf8 *path) void path_remove_extension(utf8 *path)
{ {
// Find last dot in filename, and replace it with a null-terminator // Find last dot in filename, and replace it with a null-terminator
char *lastDot = strrchr(path_get_filename(path), '.'); char * lastDot = (char *)strrchr(path_get_filename(path), '.');
if (lastDot != NULL) if (lastDot != NULL)
*lastDot = '\0'; *lastDot = '\0';
else else