diff options
| -rw-r--r-- | config.lib | 2 | ||||
| -rw-r--r-- | src/network/network_client.cpp | 4 | ||||
| -rw-r--r-- | src/saveload.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config.lib b/config.lib index 017a84622..4b88c8d9b 100644 --- a/config.lib +++ b/config.lib @@ -934,7 +934,7 @@ make_cflags_and_ldflags() { fi if [ $cc_version -ge 30 ]; then - CFLAGS="$CFLAGS -W -Wno-unused-parameter" + CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2" fi if [ $cc_version -ge 34 ]; then diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index eb129ffe1..3516baa9f 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -82,10 +82,10 @@ void HashCurrentCompanyPassword() if (StrEmpty(_network_player_info[_local_player].password)) return; _password_game_seed = _patches.generation_seed; - snprintf(_password_server_unique_id, sizeof(_password_server_unique_id), _network_unique_id); + ttd_strlcpy(_password_server_unique_id, _network_unique_id, sizeof(_password_server_unique_id)); const char *new_pw = GenerateCompanyPasswordHash(_network_player_info[_local_player].password); - snprintf(_network_player_info[_local_player].password, sizeof(_network_player_info[_local_player].password), new_pw); + ttd_strlcpy(_network_player_info[_local_player].password, new_pw, sizeof(_network_player_info[_local_player].password)); } diff --git a/src/saveload.cpp b/src/saveload.cpp index 33b5c7eaf..8a4eba1a7 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -1580,7 +1580,7 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded) if (_sl.excpt_uninit != NULL) _sl.excpt_uninit(); ShowInfo(GetSaveLoadErrorString()); - fprintf(stderr, GetSaveLoadErrorString()); + DEBUG(sl, 0, GetSaveLoadErrorString()); if (threaded) { SetAsyncSaveFinish(SaveFileError); |