Replace NULL with nullptr in the codebase
This commit is contained in:
parent
167677d9de
commit
3b8ceb00f0
17 changed files with 27 additions and 27 deletions
|
@ -408,7 +408,7 @@ bool config_cache::delete_cache_files(const std::vector<std::string>& paths,
|
|||
}
|
||||
|
||||
config_cache_transaction::state config_cache_transaction::state_ = FREE;
|
||||
config_cache_transaction* config_cache_transaction::active_ = 0;
|
||||
config_cache_transaction* config_cache_transaction::active_ = nullptr;
|
||||
|
||||
config_cache_transaction::config_cache_transaction()
|
||||
: define_filenames_()
|
||||
|
@ -422,7 +422,7 @@ config_cache_transaction::config_cache_transaction()
|
|||
config_cache_transaction::~config_cache_transaction()
|
||||
{
|
||||
state_ = FREE;
|
||||
active_ = 0;
|
||||
active_ = nullptr;
|
||||
}
|
||||
|
||||
void config_cache_transaction::lock()
|
||||
|
|
|
@ -37,7 +37,7 @@ int main(int, char** argv)
|
|||
}
|
||||
|
||||
Mix_Music* music = Mix_LoadMUS(argv[1]);
|
||||
if (music == NULL) {
|
||||
if (music == nullptr) {
|
||||
fprintf(stdout, "Cannot load music file: %s\\n", Mix_GetError());
|
||||
Mix_CloseAudio();
|
||||
return (EXIT_FAILURE);
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
int main(int, char** argv)
|
||||
{
|
||||
SDL_RWops *src = SDL_RWFromFile(argv[1], "rb");
|
||||
if (src == NULL) {
|
||||
if (src == nullptr) {
|
||||
exit(2);
|
||||
}
|
||||
exit(!IMG_isJPG(src));
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
int main(int, char** argv)
|
||||
{
|
||||
SDL_RWops *src = SDL_RWFromFile(argv[1], "rb");
|
||||
if (src == NULL) {
|
||||
if (src == nullptr) {
|
||||
exit(2);
|
||||
}
|
||||
exit(!IMG_isPNG(src));
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
int main(int, char** argv)
|
||||
{
|
||||
SDL_RWops *src = SDL_RWFromFile(argv[1], "rb");
|
||||
if (src == NULL) {
|
||||
if (src == nullptr) {
|
||||
exit(2);
|
||||
}
|
||||
exit(!IMG_isWEBP(src));
|
||||
|
|
|
@ -437,7 +437,7 @@ void mouse_button<I>::initialize_state(int32_t button_state)
|
|||
{
|
||||
last_click_stamp_ = {};
|
||||
last_clicked_widget_ = nullptr;
|
||||
focus_ = 0;
|
||||
focus_ = nullptr;
|
||||
// SDL_BUTTON_LEFT, SDL_BUTTON_MIDDLE, and SDL_BUTTON_RIGHT correspond to 1,2,3
|
||||
is_down_ = button_state & SDL_BUTTON(I + 1);
|
||||
}
|
||||
|
|
|
@ -220,7 +220,7 @@ void chatbox::append_to_chatbox(const std::string& text, std::size_t id, const b
|
|||
|
||||
const std::string before_message = log.get_value().empty() ? "" : "\n";
|
||||
const std::string new_text = formatter()
|
||||
<< log.get_value() << before_message << markup::span_color("#bcb088", prefs::get().get_chat_timestamp(std::time(0)), text);
|
||||
<< log.get_value() << before_message << markup::span_color("#bcb088", prefs::get().get_chat_timestamp(std::time(nullptr)), text);
|
||||
|
||||
log.set_use_markup(true);
|
||||
log.set_value(new_text);
|
||||
|
|
|
@ -70,7 +70,7 @@ md5::md5(const std::string& input) {
|
|||
assert(utils::md5::DIGEST_SIZE == md5_digest_len);
|
||||
|
||||
// MD5_Init
|
||||
EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);
|
||||
EVP_DigestInit_ex(mdctx, EVP_md5(), nullptr);
|
||||
|
||||
// MD5_Update
|
||||
EVP_DigestUpdate(mdctx, input.c_str(), input.size());
|
||||
|
|
|
@ -269,7 +269,7 @@ void set_log_to_file()
|
|||
|
||||
// make stdout unbuffered - otherwise some output might be lost
|
||||
// in practice shouldn't make much difference either way, given how little output goes through stdout/std::cout
|
||||
if(setvbuf(stdout, NULL, _IONBF, 2) == -1) {
|
||||
if(setvbuf(stdout, nullptr, _IONBF, 2) == -1) {
|
||||
std::cerr << "Failed to set stdout to be unbuffered";
|
||||
}
|
||||
|
||||
|
|
|
@ -325,7 +325,7 @@ static void add_localized_overlay(const std::string& ovr_file, surface& orig_sur
|
|||
|
||||
SDL_Rect area {0, 0, ovr_surf->w, ovr_surf->h};
|
||||
|
||||
sdl_blit(ovr_surf, 0, orig_surf, &area);
|
||||
sdl_blit(ovr_surf, nullptr, orig_surf, &area);
|
||||
}
|
||||
|
||||
static surface load_image_file(const image::locator& loc)
|
||||
|
|
|
@ -855,7 +855,7 @@ bool playsingle_controller::should_return_to_play_side() const
|
|||
return true;
|
||||
} else if(gamestate().in_phase(game_data::TURN_ENDED)) {
|
||||
return true;
|
||||
} else if((gamestate().in_phase(game_data::TURN_STARTING_WAITING) || end_turn_requested_) && replay_controller_.get() == 0 && current_team().is_local() && !current_team().is_idle()) {
|
||||
} else if((gamestate().in_phase(game_data::TURN_STARTING_WAITING) || end_turn_requested_) && replay_controller_.get() == nullptr && current_team().is_local() && !current_team().is_idle()) {
|
||||
// When we are a locally controlled side and havent done init_side yet also return to play_side
|
||||
return true;
|
||||
} else {
|
||||
|
|
|
@ -1933,15 +1933,15 @@ preferences::secure_buffer prefs::aes_encrypt(const preferences::secure_buffer&
|
|||
if(!ctx)
|
||||
{
|
||||
ERR_CFG << "AES EVP_CIPHER_CTX_new failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
||||
// TODO: use EVP_EncryptInit_ex2 once openssl 3.0 is more widespread
|
||||
if(EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key.data(), iv) != 1)
|
||||
if(EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), nullptr, key.data(), iv) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_EncryptInit_ex failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
@ -1949,7 +1949,7 @@ preferences::secure_buffer prefs::aes_encrypt(const preferences::secure_buffer&
|
|||
if(EVP_EncryptUpdate(ctx, encrypted_buffer, &update_length, plaintext.data(), plaintext.size()) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_EncryptUpdate failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
@ -1958,7 +1958,7 @@ preferences::secure_buffer prefs::aes_encrypt(const preferences::secure_buffer&
|
|||
if(EVP_EncryptFinal_ex(ctx, encrypted_buffer + update_length, &extra_length) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_EncryptFinal failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
@ -2021,15 +2021,15 @@ preferences::secure_buffer prefs::aes_decrypt(const preferences::secure_buffer&
|
|||
if(!ctx)
|
||||
{
|
||||
ERR_CFG << "AES EVP_CIPHER_CTX_new failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
||||
// TODO: use EVP_DecryptInit_ex2 once openssl 3.0 is more widespread
|
||||
if(EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key.data(), iv) != 1)
|
||||
if(EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), nullptr, key.data(), iv) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_DecryptInit_ex failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
@ -2037,7 +2037,7 @@ preferences::secure_buffer prefs::aes_decrypt(const preferences::secure_buffer&
|
|||
if(EVP_DecryptUpdate(ctx, plaintext_buffer, &update_length, encrypted.data(), encrypted.size()) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_DecryptUpdate failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
@ -2046,7 +2046,7 @@ preferences::secure_buffer prefs::aes_decrypt(const preferences::secure_buffer&
|
|||
if(EVP_DecryptFinal_ex(ctx, plaintext_buffer + update_length, &extra_length) != 1)
|
||||
{
|
||||
ERR_CFG << "AES EVP_DecryptFinal failed with error:";
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
|
||||
ERR_CFG << ERR_error_string(ERR_get_error(), nullptr);
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return preferences::secure_buffer();
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ bool application_lua_kernel::thread::is_running() {
|
|||
return started_ ? (lua_status(T_) == LUA_YIELD) : (lua_status(T_) == LUA_OK);
|
||||
}
|
||||
|
||||
static char * v_threadtableKey = 0;
|
||||
static char * v_threadtableKey = nullptr;
|
||||
static void * const threadtableKey = static_cast<void *> (& v_threadtableKey);
|
||||
|
||||
static lua_State * get_new_thread(lua_State * L)
|
||||
|
|
|
@ -63,7 +63,7 @@ namespace {
|
|||
return 0;
|
||||
}
|
||||
|
||||
char** end = 0;
|
||||
char** end = nullptr;
|
||||
int res = strtol(&s[0], end, 10);
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace
|
|||
|
||||
std::string generate_salt(std::size_t len)
|
||||
{
|
||||
boost::mt19937 mt(std::time(0));
|
||||
boost::mt19937 mt(std::time(nullptr));
|
||||
auto salt = std::string(len, '0');
|
||||
boost::uniform_int<> from_str(0, 63); // 64 possible values for base64
|
||||
boost::variate_generator< boost::mt19937, boost::uniform_int<>> get_char(mt, from_str);
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
// ~fake_display_manager();
|
||||
};
|
||||
|
||||
fake_display_manager* fake_display_manager::manager_ = 0;
|
||||
fake_display_manager* fake_display_manager::manager_ = nullptr;
|
||||
|
||||
fake_display_manager* fake_display_manager::get_manager()
|
||||
{
|
||||
|
|
|
@ -25,7 +25,7 @@ std::string get_unknown_exception_type()
|
|||
#if defined(__clang__) || defined(__GNUG__)
|
||||
std::string to_demangle = __cxxabiv1::__cxa_current_exception_type()->name();
|
||||
int status = 0;
|
||||
char* buff = __cxxabiv1::__cxa_demangle(to_demangle.c_str(), NULL, NULL, &status);
|
||||
char* buff = __cxxabiv1::__cxa_demangle(to_demangle.c_str(), nullptr, nullptr, &status);
|
||||
if(status == 0)
|
||||
{
|
||||
std::string demangled = buff;
|
||||
|
|
Loading…
Add table
Reference in a new issue