mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: replace char* with std::string_view

pull/14133/head
Rubidium 2025-04-27 18:31:42 +02:00 committed by rubidium42
parent e1859df1c0
commit 49ef3eee13
25 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blitter/factory.hpp
View File

@ -55,7 +55,7 @@ protected:
* @pre description != nullptr.
* @pre There is no blitter registered with this name.
*/
BlitterFactory(const char *name, const char *description, bool usable = true) :
BlitterFactory(std::string_view name, std::string_view description, bool usable = true) :
name(name), description(description)
{
if (usable) {

4
src/command.cpp
View File

@ -74,7 +74,7 @@ int RecursiveCommandCounter::_counter = 0;
* the #CommandFlag::Auto, #CommandFlag::Offline and #CommandFlag::Server values.
*/
struct CommandInfo {
const char *name; ///< A human readable name for the procedure
std::string_view name; ///< A human readable name for the procedure
CommandFlags flags; ///< The (command) flags to that apply to this command
CommandType type; ///< The type of command.
};
@ -129,7 +129,7 @@ CommandFlags GetCommandFlags(Commands cmd)
* @param cmd The integer value of the command
* @return The name for this command
*/
const char *GetCommandName(Commands cmd)
std::string_view GetCommandName(Commands cmd)
{
assert(IsValidCommand(cmd));

2
src/command_func.h
View File

@ -31,7 +31,7 @@ void NetworkSendCommand(Commands cmd, StringID err_message, CommandCallback *cal
bool IsValidCommand(Commands cmd);
CommandFlags GetCommandFlags(Commands cmd);
const char *GetCommandName(Commands cmd);
std::string_view GetCommandName(Commands cmd);
bool IsCommandAllowedWhilePaused(Commands cmd);
template <Commands Tcmd>

2
src/command_type.h
View File

@ -470,7 +470,7 @@ template <Commands Tcmd> struct CommandTraits;
static constexpr auto &proc = proc_; \
static constexpr CommandFlags flags = flags_; \
static constexpr CommandType type = type_; \
static inline constexpr const char *name = #proc_; \
static inline constexpr std::string_view name = #proc_; \
};
/** Storage buffer for serialized command data. */

15
src/console_cmds.cpp
View File

@ -2237,9 +2237,9 @@ struct ConsoleContentCallback : public ContentCallback {
*/
static void OutputContentState(const ContentInfo &ci)
{
static const char * const types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap", "Base sound", "Base music", "Game script", "GS library" };
static const std::string_view types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap", "Base sound", "Base music", "Game script", "GS library" };
static_assert(lengthof(types) == CONTENT_TYPE_END - CONTENT_TYPE_BEGIN);
static const char * const states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
static const std::string_view states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
static const TextColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR };
IConsolePrint(state_to_colour[ci.state], "{}, {}, {}, {}, {:08X}, {}", ci.id, types[ci.type - 1], states[ci.state], ci.name, ci.unique_id, FormatArrayAsHex(ci.md5sum));
@ -2475,7 +2475,7 @@ static bool ConListDirs(std::span<std::string_view> argv)
{
struct SubdirNameMap {
Subdirectory subdir; ///< Index of subdirectory type
const char *name; ///< UI name for the directory
std::string_view name; ///< UI name for the directory
bool default_only; ///< Whether only the default (first existing) directory for this is interesting
};
static const SubdirNameMap subdir_name_map[] = {
@ -2498,10 +2498,13 @@ static bool ConListDirs(std::span<std::string_view> argv)
if (argv.size() != 2) {
IConsolePrint(CC_HELP, "List all search paths or default directories for various categories.");
IConsolePrint(CC_HELP, "Usage: list_dirs <category>");
std::string cats = subdir_name_map[0].name;
std::string cats{subdir_name_map[0].name};
bool first = true;
for (const SubdirNameMap &sdn : subdir_name_map) {
if (!first) cats = cats + ", " + sdn.name;
if (!first) {
cats += ", ";
cats += sdn.name;
}
first = false;
}
IConsolePrint(CC_HELP, "Valid categories: {}", cats);
@ -2567,7 +2570,7 @@ static bool ConNewGRFProfile(std::span<std::string_view> argv)
bool selected = profiler != _newgrf_profilers.end();
bool active = selected && profiler->active;
TextColour tc = active ? TC_LIGHT_BLUE : selected ? TC_GREEN : CC_INFO;
const char *statustext = active ? " (active)" : selected ? " (selected)" : "";
std::string_view statustext = active ? " (active)" : selected ? " (selected)" : "";
IConsolePrint(tc, "{}: [{:08X}] {}{}", i, std::byteswap(grf.grfid), grf.filename, statustext);
i++;
}

4
src/core/pool_type.hpp
View File

@ -137,7 +137,7 @@ public:
using BitmapStorage = size_t;
static constexpr size_t BITMAP_SIZE = std::numeric_limits<BitmapStorage>::digits;
const char * const name = nullptr; ///< Name of this pool
const std::string_view name{}; ///< Name of this pool
size_t first_free = 0; ///< No item with index lower than this is free (doesn't say anything about this one!)
size_t first_unused = 0; ///< This and all higher indexes are free (doesn't say anything about first_unused-1 !)
@ -150,7 +150,7 @@ public:
std::vector<Titem *> data{}; ///< Pointers to Titem
std::vector<BitmapStorage> used_bitmap{}; ///< Bitmap of used indices.
Pool(const char *name) : PoolBase(Tpool_type), name(name) {}
Pool(std::string_view name) : PoolBase(Tpool_type), name(name) {}
void CleanPool() override;
/**

2
src/crashlog.cpp
View File

@ -73,7 +73,7 @@ static void SurveyRecentNews(nlohmann::json &json)
* @param with_dir Whether to prepend the filename with the personal directory.
* @return The filename
*/
std::string CrashLog::CreateFileName(const char *ext, bool with_dir) const
std::string CrashLog::CreateFileName(std::string_view ext, bool with_dir) const
{
static std::string crashname;

2
src/crashlog.h
View File

@ -46,7 +46,7 @@ private:
virtual bool TryExecute(std::string_view section_name, std::function<bool()> &&func) = 0;
protected:
std::string CreateFileName(const char *ext, bool with_dir = true) const;
std::string CreateFileName(std::string_view ext, bool with_dir = true) const;
public:
/** Stub destructor to silence some compilers. */

2
src/currency.h
View File

@ -94,7 +94,7 @@ struct CurrencySpec {
CurrencySpec() = default;
CurrencySpec(uint16_t rate, const char *separator, TimerGameCalendar::Year to_euro, const char *prefix, const char *suffix, const char *code, uint8_t symbol_pos, StringID name) :
CurrencySpec(uint16_t rate, std::string_view separator, TimerGameCalendar::Year to_euro, std::string_view prefix, std::string_view suffix, std::string_view code, uint8_t symbol_pos, StringID name) :
rate(rate), separator(separator), to_euro(to_euro), prefix(prefix), suffix(suffix), code(code), symbol_pos(symbol_pos), name(name)
{
}

8
src/debug.cpp
View File

@ -28,7 +28,7 @@
/** Element in the queue of debug messages that have to be passed to either NetworkAdminConsole or IConsolePrint.*/
struct QueuedDebugItem {
std::string level; ///< The used debug level.
std::string_view level; ///< The used debug level.
std::string message; ///< The actual formatted message.
};
std::atomic<bool> _debug_remote_console; ///< Whether we need to send data to either NetworkAdminConsole or IConsolePrint.
@ -107,16 +107,16 @@ void DumpDebugFacilityNames(std::back_insert_iterator<std::string> &output_itera
* @param level Debug category.
* @param message The message to output.
*/
void DebugPrint(const char *category, int level, std::string &&message)
void DebugPrint(std::string_view category, int level, std::string &&message)
{
if (strcmp(category, "desync") == 0 && level != 0) {
if (category == "desync" && level != 0) {
static auto f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
if (!f.has_value()) return;
fmt::print(*f, "{}{}\n", GetLogPrefix(true), message);
fflush(*f);
#ifdef RANDOM_DEBUG
} else if (strcmp(category, "random") == 0) {
} else if (category == "random") {
static auto f = FioFOpenFile("random-out.log", "wb", AUTOSAVE_DIR);
if (!f.has_value()) return;

2
src/debug.h
View File

@ -35,7 +35,7 @@
* @param format_string The formatting string of the message.
*/
#define Debug(category, level, format_string, ...) do { if ((level) == 0 || _debug_ ## category ## _level >= (level)) DebugPrint(#category, level, fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__)); } while (false)
void DebugPrint(const char *category, int level, std::string &&message);
void DebugPrint(std::string_view category, int level, std::string &&message);
extern int _debug_driver_level;
extern int _debug_grf_level;

4
src/gfx_type.h
View File

@ -252,9 +252,9 @@ enum FontSize : uint8_t {
};
DECLARE_INCREMENT_DECREMENT_OPERATORS(FontSize)
inline const char *FontSizeToName(FontSize fs)
inline std::string_view FontSizeToName(FontSize fs)
{
static const char *SIZE_TO_NAME[] = { "medium", "small", "large", "mono" };
static const std::string_view SIZE_TO_NAME[] = { "medium", "small", "large", "mono" };
assert(fs < FS_END);
return SIZE_TO_NAME[fs];
}

10
src/heightmap.cpp
View File

@ -135,7 +135,7 @@ static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_pt
* If map == nullptr only the size of the PNG is read, otherwise a map
* with grayscale pixels is allocated and assigned to *map.
*/
static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
static bool ReadHeightmapPNG(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
{
png_structp png_ptr = nullptr;
png_infop info_ptr = nullptr;
@ -256,7 +256,7 @@ static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &inf
* If map == nullptr only the size of the BMP is read, otherwise a map
* with grayscale pixels is allocated and assigned to *map.
*/
static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
static bool ReadHeightmapBMP(std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
{
auto f = FioFOpenFile(filename, "rb", HEIGHTMAP_DIR);
if (!f.has_value()) {
@ -475,7 +475,7 @@ void FixSlopes()
* @param[in,out] map If not \c nullptr, destination to store the loaded block of image data.
* @return Whether loading was successful.
*/
static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
static bool ReadHeightMap(DetailedFileType dft, std::string_view filename, uint *x, uint *y, std::vector<uint8_t> *map)
{
switch (dft) {
default:
@ -499,7 +499,7 @@ static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, u
* @param y dimension y
* @return Returns false if loading of the image failed.
*/
bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y)
bool GetHeightmapDimensions(DetailedFileType dft, std::string_view filename, uint *x, uint *y)
{
return ReadHeightMap(dft, filename, x, y, nullptr);
}
@ -511,7 +511,7 @@ bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x,
* @param dft Type of image file.
* @param filename of the heightmap file to be imported
*/
bool LoadHeightmap(DetailedFileType dft, const char *filename)
bool LoadHeightmap(DetailedFileType dft, std::string_view filename)
{
uint x, y;
std::vector<uint8_t> map;

4
src/heightmap.h
View File

@ -21,8 +21,8 @@ enum HeightmapRotation : uint8_t {
HM_CLOCKWISE, ///< Rotate the map clockwise 45 degrees
};
bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x, uint *y);
bool LoadHeightmap(DetailedFileType dft, const char *filename);
bool GetHeightmapDimensions(DetailedFileType dft, std::string_view filename, uint *x, uint *y);
bool LoadHeightmap(DetailedFileType dft, std::string_view filename);
void FlatEmptyWorld(uint8_t tile_height);
void FixSlopes();

15
src/misc/dbg_helpers.cpp
View File

@ -9,12 +9,13 @@
#include "../stdafx.h"
#include "../rail_map.h"
#include "../core/enum_type.hpp"
#include "dbg_helpers.h"
#include "../safeguards.h"
/** Trackdir & TrackdirBits short names. */
static const char * const trackdir_names[] = {
static const std::string_view trackdir_names[] = {
"NE", "SE", "UE", "LE", "LS", "RS", "rne", "rse",
"SW", "NW", "UW", "LW", "LN", "RN", "rsw", "rnw",
};
@ -22,37 +23,37 @@ static const char * const trackdir_names[] = {
/** Return name of given Trackdir. */
std::string ValueStr(Trackdir td)
{
return std::to_string(td) + " (" + ItemAtT(td, trackdir_names, "UNK", INVALID_TRACKDIR, "INV") + ")";
return fmt::format("{} ({})", to_underlying(td), ItemAtT(td, trackdir_names, "UNK", INVALID_TRACKDIR, "INV"));
}
/** Return composed name of given TrackdirBits. */
std::string ValueStr(TrackdirBits td_bits)
{
return std::to_string(td_bits) + " (" + ComposeNameT(td_bits, trackdir_names, "UNK", INVALID_TRACKDIR_BIT, "INV") + ")";
return fmt::format("{} ({})", to_underlying(td_bits), ComposeNameT(td_bits, trackdir_names, "UNK", INVALID_TRACKDIR_BIT, "INV"));
}
/** DiagDirection short names. */
static const char * const diagdir_names[] = {
static const std::string_view diagdir_names[] = {
"NE", "SE", "SW", "NW",
};
/** Return name of given DiagDirection. */
std::string ValueStr(DiagDirection dd)
{
return std::to_string(dd) + " (" + ItemAtT(dd, diagdir_names, "UNK", INVALID_DIAGDIR, "INV") + ")";
return fmt::format("{} ({})", to_underlying(dd), ItemAtT(dd, diagdir_names, "UNK", INVALID_DIAGDIR, "INV"));
}
/** SignalType short names. */
static const char * const signal_type_names[] = {
static const std::string_view signal_type_names[] = {
"NORMAL", "ENTRY", "EXIT", "COMBO", "PBS", "NOENTRY",
};
/** Return name of given SignalType. */
std::string ValueStr(SignalType t)
{
return std::to_string(t) + " (" + ItemAtT(t, signal_type_names, "UNK") + ")";
return fmt::format("{} ({})", to_underlying(t), ItemAtT(t, signal_type_names, "UNK"));
}

4
src/network/network_admin.cpp
View File

@ -574,12 +574,12 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendCmdNames()
auto p = std::make_unique<Packet>(this, ADMIN_PACKET_SERVER_CMD_NAMES);
for (uint16_t i = 0; i < CMD_END; i++) {
const char *cmdname = GetCommandName(static_cast<Commands>(i));
std::string_view cmdname = GetCommandName(static_cast<Commands>(i));
/* Should COMPAT_MTU be exceeded, start a new packet
* (magic 5: 1 bool "more data" and one uint16_t "command id", one
* byte for string '\0' termination and 1 bool "no more data" */
if (!p->CanWriteToPacket(strlen(cmdname) + 5)) {
if (!p->CanWriteToPacket(cmdname.size() + 5)) {
p->Send_bool(false);
this->SendPacket(std::move(p));

2
src/newgrf.cpp
View File

@ -323,7 +323,7 @@ CargoTypes TranslateRefitMask(uint32_t refit_mask)
* @param error_location Function name for grf error messages
* @param[out] index If \a base_pointer is valid, \a index is assigned to the matching price; else it is left unchanged
*/
void ConvertTTDBasePrice(uint32_t base_pointer, const char *error_location, Price *index)
void ConvertTTDBasePrice(uint32_t base_pointer, std::string_view error_location, Price *index)
{
/* Special value for 'none' */
if (base_pointer == 0) {

2
src/newgrf/newgrf_act0.cpp
View File

@ -109,7 +109,7 @@ std::vector<BadgeID> ReadBadgeList(ByteReader &buf, GrfSpecFeature feature)
return badges;
}
bool HandleChangeInfoResult(const char *caller, ChangeInfoResult cir, uint8_t feature, uint8_t property)
bool HandleChangeInfoResult(std::string_view caller, ChangeInfoResult cir, uint8_t feature, uint8_t property)
{
switch (cir) {
default: NOT_REACHED();

2
src/newgrf/newgrf_act0_globalvar.cpp
View File

@ -67,7 +67,7 @@ static ChangeInfoResult LoadTranslationTable(uint first, uint last, ByteReader &
return CIR_SUCCESS;
}
static ChangeInfoResult LoadBadgeTranslationTable(uint first, uint last, ByteReader &buf, std::vector<BadgeID> &translation_table, const char *name)
static ChangeInfoResult LoadBadgeTranslationTable(uint first, uint last, ByteReader &buf, std::vector<BadgeID> &translation_table, std::string_view name)
{
if (first != 0 && first != std::size(translation_table)) {
GrfMsg(1, "LoadBadgeTranslationTable: {} translation table must start at zero or {}", name, std::size(translation_table));

2
src/newgrf/newgrf_act3.cpp
View File

@ -65,7 +65,7 @@ static CargoType TranslateCargo(uint8_t feature, uint8_t ctype)
}
static bool IsValidGroupID(uint16_t groupid, const char *function)
static bool IsValidGroupID(uint16_t groupid, std::string_view function)
{
if (groupid > MAX_SPRITEGROUP || _cur_gps.spritegroups[groupid] == nullptr) {
GrfMsg(1, "{}: Spritegroup 0x{:04X} out of range or empty, skipping.", function, groupid);

2
src/newgrf/newgrf_actd.cpp
View File

@ -132,7 +132,7 @@ static uint32_t GetPatchVariable(uint8_t param)
}
}
static uint32_t PerformGRM(std::span<uint32_t> grm, uint16_t count, uint8_t op, uint8_t target, const char *type)
static uint32_t PerformGRM(std::span<uint32_t> grm, uint16_t count, uint8_t op, uint8_t target, std::string_view type)
{
uint start = 0;
uint size = 0;

2
src/newgrf/newgrf_internal.h
View File

@ -198,7 +198,7 @@ bool ReadSpriteLayout(ByteReader &buf, uint num_building_sprites, bool use_cur_s
GRFFile *GetFileByGRFID(uint32_t grfid);
GRFError *DisableGrf(StringID message = {}, GRFConfig *config = nullptr);
void DisableStaticNewGRFInfluencingNonStaticNewGRFs(GRFConfig &c);
bool HandleChangeInfoResult(const char *caller, ChangeInfoResult cir, uint8_t feature, uint8_t property);
bool HandleChangeInfoResult(std::string_view caller, ChangeInfoResult cir, uint8_t feature, uint8_t property);
uint32_t GetParamVal(uint8_t param, uint32_t *cond_val);
void GRFUnsafe(ByteReader &);

2
src/newgrf/newgrf_internal_vehicle.h
View File

@ -52,7 +52,7 @@ struct GRFTempEngineData {
extern ReferenceThroughBaseContainer<std::vector<GRFTempEngineData>> _gted; ///< Temporary engine data used during NewGRF loading
Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16_t internal_id, bool static_access = false);
void ConvertTTDBasePrice(uint32_t base_pointer, const char *error_location, Price *index);
void ConvertTTDBasePrice(uint32_t base_pointer, std::string_view error_location, Price *index);
/**
* Helper to check whether an image index is valid for a particular NewGRF vehicle.

4
src/random_access_file.cpp
View File

@ -22,7 +22,7 @@
* @param filename Name of the file at the disk.
* @param subdir The sub directory to search this file in.
*/
RandomAccessFile::RandomAccessFile(const std::string &filename, Subdirectory subdir) : filename(filename)
RandomAccessFile::RandomAccessFile(std::string_view filename, Subdirectory subdir) : filename(filename)
{
size_t file_size;
this->file_handle = FioFOpenFile(filename, "rb", subdir, &file_size);
@ -38,7 +38,7 @@ RandomAccessFile::RandomAccessFile(const std::string &filename, Subdirectory sub
/* Store the filename without path and extension */
auto t = filename.rfind(PATHSEPCHAR);
std::string name_without_path = filename.substr(t != std::string::npos ? t + 1 : 0);
std::string name_without_path{filename.substr(t != std::string::npos ? t + 1 : 0)};
this->simplified_filename = name_without_path.substr(0, name_without_path.rfind('.'));
strtolower(this->simplified_filename);

2
src/random_access_file_type.h
View File

@ -36,7 +36,7 @@ class RandomAccessFile {
uint8_t buffer_start[BUFFER_SIZE]; ///< Local buffer when read from file.
public:
RandomAccessFile(const std::string &filename, Subdirectory subdir);
RandomAccessFile(std::string_view filename, Subdirectory subdir);
RandomAccessFile(const RandomAccessFile&) = delete;
void operator=(const RandomAccessFile&) = delete;