From 15f978820fd2a2a76e46eb005c18dc837535fd36 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Mon, 7 Mar 2022 21:22:10 -0800 Subject: [PATCH] replace all NULLs with nullptr --- src/ChatCommands.cc | 8 +- src/DNSServer.cc | 2 +- src/IPStackSimulator.cc | 8 +- src/Items.cc | 2 +- src/Lobby.cc | 2 +- src/Lobby.hh | 2 +- src/NetworkAddresses.cc | 4 +- src/ProxyServer.cc | 8 +- src/Quest.cc | 2 +- src/ReceiveCommands.cc | 564 ++++++++++++++++++-------------------- src/ReceiveSubcommands.cc | 2 +- src/SendCommands.cc | 2 +- src/SendCommands.hh | 8 +- src/Server.cc | 10 +- src/ServerState.cc | 2 +- src/ServerState.hh | 4 +- src/Shell.cc | 6 +- src/Text.cc | 4 +- 18 files changed, 301 insertions(+), 339 deletions(-) diff --git a/src/ChatCommands.cc b/src/ChatCommands.cc index 9c41fb33..87665fad 100644 --- a/src/ChatCommands.cc +++ b/src/ChatCommands.cc @@ -423,7 +423,7 @@ static void command_announce(shared_ptr s, shared_ptr, static void command_arrow(shared_ptr, shared_ptr l, shared_ptr c, const char16_t* args) { // no preconditions - c->lobby_arrow_color = stoull(encode_sjis(args), NULL, 0); + c->lobby_arrow_color = stoull(encode_sjis(args), nullptr, 0); if (!l->is_game()) { send_arrow_update(l); } @@ -756,7 +756,7 @@ static void command_ban(shared_ptr s, shared_ptr l, return; } - uint64_t usecs = stoull(encode_sjis(args), NULL, 0) * 1000000; + uint64_t usecs = stoull(encode_sjis(args), nullptr, 0) * 1000000; size_t unit_offset = 0; for (; isdigit(args[unit_offset]); unit_offset++); @@ -791,7 +791,7 @@ static void command_warp(shared_ptr, shared_ptr l, check_is_game(l, true); check_cheats_enabled(l); - uint32_t area = stoul(encode_sjis(args), NULL, 0); + uint32_t area = stoul(encode_sjis(args), nullptr, 0); if (!l->episode || (l->episode > 3)) { return; } @@ -917,7 +917,7 @@ void process_chat_command(std::shared_ptr s, std::shared_ptr text_str.clear(); } - const ChatCommandDefinition* def = NULL; + const ChatCommandDefinition* def = nullptr; try { def = &chat_commands.at(command_name); } catch (const out_of_range&) { diff --git a/src/DNSServer.cc b/src/DNSServer.cc index 7dd98ba2..f1008bd1 100644 --- a/src/DNSServer.cc +++ b/src/DNSServer.cc @@ -45,7 +45,7 @@ void DNSServer::add_socket(int fd) { unique_ptr e(event_new(this->base.get(), fd, EV_READ | EV_PERSIST, &DNSServer::dispatch_on_receive_message, this), event_free); - event_add(e.get(), NULL); + event_add(e.get(), nullptr); this->fd_to_receive_event.emplace(fd, move(e)); } diff --git a/src/IPStackSimulator.cc b/src/IPStackSimulator.cc index 603be58e..f0bd2fd9 100644 --- a/src/IPStackSimulator.cc +++ b/src/IPStackSimulator.cc @@ -173,7 +173,7 @@ void IPStackSimulator::on_listen_accept(struct evconnlistener* listener, c->sim = this; this->bev_to_client.emplace(make_pair(bev, c)); - bufferevent_setcb(bev, &IPStackSimulator::dispatch_on_client_input, NULL, + bufferevent_setcb(bev, &IPStackSimulator::dispatch_on_client_input, nullptr, &IPStackSimulator::dispatch_on_client_error, this); bufferevent_enable(bev, EV_READ | EV_WRITE); } @@ -187,7 +187,7 @@ void IPStackSimulator::on_listen_error(struct evconnlistener* listener) { int err = EVUTIL_SOCKET_ERROR(); log(ERROR, "[IPStackSimulator] Failure on listening socket %d: %d (%s)", evconnlistener_get_fd(listener), err, evutil_socket_error_to_string(err)); - event_base_loopexit(this->base.get(), NULL); + event_base_loopexit(this->base.get(), nullptr); } @@ -742,8 +742,8 @@ void IPStackSimulator::open_server_connection( bufferevent_pair_new(this->base.get(), 0, bevs); // Set up the IPStackSimulator end of the virtual connection - bufferevent_setcb(bevs[0], &IPStackSimulator::dispatch_on_server_input, NULL, - &IPStackSimulator::dispatch_on_server_error, &conn); + bufferevent_setcb(bevs[0], &IPStackSimulator::dispatch_on_server_input, + nullptr, &IPStackSimulator::dispatch_on_server_error, &conn); bufferevent_enable(bevs[0], EV_READ | EV_WRITE); conn.server_bev.reset(bevs[0]); diff --git a/src/Items.cc b/src/Items.cc index 968738f6..1607e768 100644 --- a/src/Items.cc +++ b/src/Items.cc @@ -219,7 +219,7 @@ void player_use_item(shared_ptr c, size_t item_index) { } if (should_delete_item) { - c->player.remove_item(item.data.item_id, 1, NULL); + c->player.remove_item(item.data.item_id, 1, nullptr); } } diff --git a/src/Lobby.cc b/src/Lobby.cc index c262a0e4..49329254 100644 --- a/src/Lobby.cc +++ b/src/Lobby.cc @@ -101,7 +101,7 @@ void Lobby::remove_client(shared_ptr c) { static_cast(other_c ? other_c->lobby_client_id : 0xFF))); } - this->clients[c->lobby_client_id] = NULL; + this->clients[c->lobby_client_id] = nullptr; // unassign the client's lobby if it matches the current lobby's id (it may // not match if the client was already added to another lobby - this can diff --git a/src/Lobby.hh b/src/Lobby.hh index 612920d4..fb723355 100644 --- a/src/Lobby.hh +++ b/src/Lobby.hh @@ -73,7 +73,7 @@ struct Lobby { void move_client_to_lobby(std::shared_ptr dest_lobby, std::shared_ptr c); - std::shared_ptr find_client(const char16_t* identifier = NULL, + std::shared_ptr find_client(const char16_t* identifier = nullptr, uint64_t serial_number = 0); void add_item(const PlayerInventoryItem& item); diff --git a/src/NetworkAddresses.cc b/src/NetworkAddresses.cc index 8ae5bf22..8be1488e 100644 --- a/src/NetworkAddresses.cc +++ b/src/NetworkAddresses.cc @@ -21,7 +21,7 @@ using namespace std; uint32_t resolve_address(const char* address) { struct addrinfo *res0; - if (getaddrinfo(address, NULL, NULL, &res0)) { + if (getaddrinfo(address, nullptr, nullptr, &res0)) { auto e = string_for_error(errno); throw runtime_error(string_printf("can\'t resolve hostname %s: %s", address, e.c_str())); @@ -29,7 +29,7 @@ uint32_t resolve_address(const char* address) { std::unique_ptr res0_unique( res0, freeaddrinfo); - struct addrinfo *res4 = NULL; + struct addrinfo *res4 = nullptr; for (struct addrinfo* res = res0; res; res = res->ai_next) { if (res->ai_family == AF_INET) { res4 = res; diff --git a/src/ProxyServer.cc b/src/ProxyServer.cc index 62b378f8..13d8d4ef 100644 --- a/src/ProxyServer.cc +++ b/src/ProxyServer.cc @@ -143,7 +143,7 @@ void ProxyServer::on_client_connect(struct bufferevent* bev) { this->client_bev.reset(bev); bufferevent_setcb(this->client_bev.get(), - &ProxyServer::dispatch_on_client_input, NULL, + &ProxyServer::dispatch_on_client_input, nullptr, &ProxyServer::dispatch_on_client_error, this); bufferevent_enable(this->client_bev.get(), EV_READ | EV_WRITE); @@ -170,7 +170,7 @@ void ProxyServer::on_client_connect(struct bufferevent* bev) { throw runtime_error(string_printf("failed to connect (%d)", EVUTIL_SOCKET_ERROR())); } bufferevent_setcb(this->server_bev.get(), - &ProxyServer::dispatch_on_server_input, NULL, + &ProxyServer::dispatch_on_server_input, nullptr, &ProxyServer::dispatch_on_server_error, this); bufferevent_enable(this->server_bev.get(), EV_READ | EV_WRITE); } @@ -179,7 +179,7 @@ void ProxyServer::on_listen_error(struct evconnlistener* listener) { int err = EVUTIL_SOCKET_ERROR(); log(ERROR, "[ProxyServer] Failure on listening socket %d: %d (%s)", evconnlistener_get_fd(listener), err, evutil_socket_error_to_string(err)); - event_base_loopexit(this->base.get(), NULL); + event_base_loopexit(this->base.get(), nullptr); } void ProxyServer::on_client_input(struct bufferevent*) { @@ -263,7 +263,7 @@ void ProxyServer::receive_and_process_commands(bool from_server) { struct bufferevent* dest_bev = from_server ? this->client_bev.get() : this->server_bev.get(); struct evbuffer* source_buf = bufferevent_get_input(source_bev); - struct evbuffer* dest_buf = dest_bev ? bufferevent_get_output(dest_bev) : NULL; + struct evbuffer* dest_buf = dest_bev ? bufferevent_get_output(dest_bev) : nullptr; PSOEncryption* source_crypt = from_server ? this->server_input_crypt.get() : this->client_input_crypt.get(); PSOEncryption* dest_crypt = from_server ? this->client_output_crypt.get() : this->server_output_crypt.get(); diff --git a/src/Quest.cc b/src/Quest.cc index 9748ac9d..5a6f0a36 100644 --- a/src/Quest.cc +++ b/src/Quest.cc @@ -200,7 +200,7 @@ Quest::Quest(const string& bin_filename) } // parse the number out of the first token - this->quest_id = strtoull(tokens[0].c_str() + 1, NULL, 10); + this->quest_id = strtoull(tokens[0].c_str() + 1, nullptr, 10); // get the category from the second token if needed if (this->category == QuestCategory::Unknown) { diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc index 5d42f74c..bd028e8d 100644 --- a/src/ReceiveCommands.cc +++ b/src/ReceiveCommands.cc @@ -206,10 +206,10 @@ void process_login_a_dc_pc_gc(shared_ptr s, shared_ptr c, try { if (c->version == GameVersion::GC) { c->license = s->license_manager->verify_gc(serial_number, cmd->access_key, - NULL); + nullptr); } else { c->license = s->license_manager->verify_pc(serial_number, cmd->access_key, - NULL); + nullptr); } } catch (const exception& e) { if (!s->allow_unregistered_users) { @@ -220,10 +220,10 @@ void process_login_a_dc_pc_gc(shared_ptr s, shared_ptr c, } else { if (c->version == GameVersion::GC) { c->license = LicenseManager::create_license_gc(serial_number, - cmd->access_key, NULL); + cmd->access_key, nullptr); } else { c->license = LicenseManager::create_license_pc(serial_number, - cmd->access_key, NULL); + cmd->access_key, nullptr); } } } @@ -300,10 +300,10 @@ void process_login_d_e_pc_gc(shared_ptr s, shared_ptr c, try { if (c->version == GameVersion::GC) { c->license = s->license_manager->verify_gc(serial_number, cmd->access_key, - NULL); + nullptr); } else { c->license = s->license_manager->verify_pc(serial_number, cmd->access_key, - NULL); + nullptr); } } catch (const exception& e) { if (!s->allow_unregistered_users) { @@ -314,10 +314,10 @@ void process_login_d_e_pc_gc(shared_ptr s, shared_ptr c, } else { if (c->version == GameVersion::GC) { c->license = LicenseManager::create_license_gc(serial_number, - cmd->access_key, NULL); + cmd->access_key, nullptr); } else { c->license = LicenseManager::create_license_pc(serial_number, - cmd->access_key, NULL); + cmd->access_key, nullptr); } } } @@ -899,7 +899,7 @@ void process_quest_list_request(shared_ptr s, shared_ptr c, return; } - vector* menu = NULL; + vector* menu = nullptr; if ((c->version == GameVersion::BB) && flag) { menu = &quest_government_menu; } else { @@ -1152,7 +1152,7 @@ void process_player_preview_request_bb(shared_ptr, shared_ptrplayer_index, NULL); + send_player_preview_bb(c, cmd->player_index, nullptr); } } } @@ -1338,7 +1338,7 @@ void process_card_search(shared_ptr s, shared_ptr c, const auto* cmd = reinterpret_cast(data); try { - auto result = s->find_client(NULL, cmd->target_serial_number); + auto result = s->find_client(nullptr, cmd->target_serial_number); auto result_lobby = s->find_lobby(result->lobby_id); send_card_search_result(s, c, result, result_lobby); } catch (const out_of_range&) { } @@ -1367,7 +1367,7 @@ void process_simple_mail(shared_ptr s, shared_ptr c, check_size(size, sizeof(Cmd)); const auto* cmd = reinterpret_cast(data); - auto target = s->find_client(NULL, cmd->target_serial_number); + auto target = s->find_client(nullptr, cmd->target_serial_number); // if the sender is blocked, don't forward the mail for (size_t y = 0; y < 30; y++) { @@ -1770,433 +1770,395 @@ typedef void (*process_command_t)(shared_ptr s, shared_ptr // array corresponding to the client's version is called. static process_command_t dc_handlers[0x100] = { // 00 - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, process_chat_dc_gc, NULL, - process_game_list_request, process_menu_item_info_request, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, process_chat_dc_gc, nullptr, + process_game_list_request, process_menu_item_info_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 10 - process_menu_selection, NULL, NULL, process_ignored_command, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, + process_menu_selection, nullptr, nullptr, process_ignored_command, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, // 20 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 30 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 40 - process_card_search, NULL, NULL, NULL, - process_ignored_command, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + process_card_search, nullptr, nullptr, nullptr, + process_ignored_command, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 50 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 60 - process_game_command, NULL, process_game_command, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_game_command, process_game_command, NULL, process_client_ready, + process_game_command, nullptr, process_game_command, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_game_command, process_game_command, nullptr, process_client_ready, // 70 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 80 - NULL, process_simple_mail, NULL, NULL, - process_change_lobby, NULL, NULL, NULL, - NULL, process_change_arrow_color, process_lobby_name_request, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_simple_mail, nullptr, nullptr, + process_change_lobby, nullptr, nullptr, nullptr, + nullptr, process_change_arrow_color, process_lobby_name_request, nullptr, + nullptr, nullptr, nullptr, nullptr, // 90 - NULL, NULL, NULL, NULL, - NULL, NULL, process_client_checksum, NULL, - process_player_data, process_ignored_command, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, process_client_checksum, nullptr, + process_player_data, process_ignored_command, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // A0 - process_change_ship, process_change_block, process_quest_list_request, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, - process_quest_ready, NULL, NULL, NULL, + process_change_ship, process_change_block, process_quest_list_request, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, + process_quest_ready, nullptr, nullptr, nullptr, // B0 - NULL, process_server_time_request, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_server_time_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // C0 - NULL, process_create_game_dc_gc, NULL, NULL, - NULL, NULL, process_set_blocked_list, process_set_auto_reply_dc_gc, - process_disable_auto_reply, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_create_game_dc_gc, nullptr, nullptr, + nullptr, nullptr, process_set_blocked_list, process_set_auto_reply_dc_gc, + process_disable_auto_reply, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // D0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_info_board_request, process_write_info_board_dc_gc, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + process_info_board_request, process_write_info_board_dc_gc, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // E0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // F0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; static process_command_t pc_handlers[0x100] = { // 00 - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, process_chat_pc_bb, NULL, - process_game_list_request, process_menu_item_info_request, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, process_chat_pc_bb, nullptr, + process_game_list_request, process_menu_item_info_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 10 - process_menu_selection, NULL, NULL, process_ignored_command, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, + process_menu_selection, nullptr, nullptr, process_ignored_command, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, // 20 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 30 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 40 - process_card_search, NULL, NULL, NULL, - process_ignored_command, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + process_card_search, nullptr, nullptr, nullptr, + process_ignored_command, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 50 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 60 - process_game_command, process_player_data, process_game_command, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_game_command, process_game_command, NULL, process_client_ready, + process_game_command, process_player_data, process_game_command, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_game_command, process_game_command, nullptr, process_client_ready, // 70 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 80 - NULL, process_simple_mail, NULL, NULL, - process_change_lobby, NULL, NULL, NULL, - NULL, process_change_arrow_color, process_lobby_name_request, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_simple_mail, nullptr, nullptr, + process_change_lobby, nullptr, nullptr, nullptr, + nullptr, process_change_arrow_color, process_lobby_name_request, nullptr, + nullptr, nullptr, nullptr, nullptr, // 90 - NULL, NULL, NULL, NULL, - NULL, NULL, process_client_checksum, NULL, - process_player_data, process_ignored_command, process_login_a_dc_pc_gc, NULL, - process_login_c_dc_pc_gc, process_login_d_e_pc_gc, process_login_d_e_pc_gc, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, process_client_checksum, nullptr, + process_player_data, process_ignored_command, process_login_a_dc_pc_gc, nullptr, + process_login_c_dc_pc_gc, process_login_d_e_pc_gc, process_login_d_e_pc_gc, nullptr, // A0 - process_change_ship, process_change_block, process_quest_list_request, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, - process_quest_ready, NULL, NULL, NULL, + process_change_ship, process_change_block, process_quest_list_request, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, + process_quest_ready, nullptr, nullptr, nullptr, // B0 - NULL, process_server_time_request, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_server_time_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // C0 - NULL, process_create_game_pc, NULL, NULL, - NULL, NULL, process_set_blocked_list, process_set_auto_reply_pc_bb, - process_disable_auto_reply, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_create_game_pc, nullptr, nullptr, + nullptr, nullptr, process_set_blocked_list, process_set_auto_reply_pc_bb, + process_disable_auto_reply, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // D0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_info_board_request, process_write_info_board_pc_bb, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + process_info_board_request, process_write_info_board_pc_bb, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // E0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // F0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; static process_command_t gc_handlers[0x100] = { // 00 - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, process_chat_dc_gc, NULL, - process_game_list_request, process_menu_item_info_request, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, process_chat_dc_gc, nullptr, + process_game_list_request, process_menu_item_info_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 10 - process_menu_selection, NULL, NULL, process_ignored_command, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, + process_menu_selection, nullptr, nullptr, process_ignored_command, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, // 20 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 30 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 40 - process_card_search, NULL, NULL, NULL, - process_ignored_command, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + process_card_search, nullptr, nullptr, nullptr, + process_ignored_command, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 50 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 60 - process_game_command, process_player_data, process_game_command, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_game_command, process_game_command, NULL, process_client_ready, + process_game_command, process_player_data, process_game_command, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_game_command, process_game_command, nullptr, process_client_ready, // 70 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 80 - NULL, process_simple_mail, NULL, NULL, - process_change_lobby, NULL, NULL, NULL, - NULL, process_change_arrow_color, process_lobby_name_request, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_simple_mail, nullptr, nullptr, + process_change_lobby, nullptr, nullptr, nullptr, + nullptr, process_change_arrow_color, process_lobby_name_request, nullptr, + nullptr, nullptr, nullptr, nullptr, // 90 - NULL, NULL, NULL, NULL, - NULL, NULL, process_client_checksum, NULL, - process_player_data, process_ignored_command, NULL, NULL, - process_login_c_dc_pc_gc, process_login_d_e_pc_gc, process_login_d_e_pc_gc, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, process_client_checksum, nullptr, + process_player_data, process_ignored_command, nullptr, nullptr, + process_login_c_dc_pc_gc, process_login_d_e_pc_gc, process_login_d_e_pc_gc, nullptr, // A0 - process_change_ship, process_change_block, process_quest_list_request, NULL, - NULL, NULL, process_start_download_quest, process_ignored_command, - NULL, process_ignored_command, NULL, NULL, - process_quest_ready, NULL, NULL, NULL, + process_change_ship, process_change_block, process_quest_list_request, nullptr, + nullptr, nullptr, process_start_download_quest, process_ignored_command, + nullptr, process_ignored_command, nullptr, nullptr, + process_quest_ready, nullptr, nullptr, nullptr, // B0 - NULL, process_server_time_request, NULL, NULL, - NULL, NULL, NULL, process_ignored_command, - process_ignored_command, NULL, process_ep3_jukebox, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_server_time_request, nullptr, nullptr, + nullptr, nullptr, nullptr, process_ignored_command, + process_ignored_command, nullptr, process_ep3_jukebox, nullptr, + nullptr, nullptr, nullptr, nullptr, // C0 - process_choice_search, process_create_game_dc_gc, NULL, NULL, - NULL, NULL, process_set_blocked_list, process_set_auto_reply_dc_gc, + process_choice_search, process_create_game_dc_gc, nullptr, nullptr, + nullptr, nullptr, process_set_blocked_list, process_set_auto_reply_dc_gc, process_disable_auto_reply, process_game_command, process_ep3_server_data_request, process_game_command, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, // D0 - NULL, NULL, NULL, NULL, - NULL, NULL, process_message_box_closed, process_gba_file_request, - process_info_board_request, process_write_info_board_dc_gc, NULL, process_verify_license_gc, - process_ep3_menu_challenge, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, process_message_box_closed, process_gba_file_request, + process_info_board_request, process_write_info_board_dc_gc, nullptr, process_verify_license_gc, + process_ep3_menu_challenge, nullptr, nullptr, nullptr, // E0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_create_game_dc_gc, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_create_game_dc_gc, nullptr, nullptr, nullptr, // F0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; static process_command_t bb_handlers[0x100] = { // 00 - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, process_chat_pc_bb, NULL, - process_game_list_request, process_menu_item_info_request, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, process_chat_pc_bb, nullptr, + process_game_list_request, process_menu_item_info_request, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 10 - process_menu_selection, NULL, NULL, process_ignored_command, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, + process_menu_selection, nullptr, nullptr, process_ignored_command, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, // 20 - NULL, NULL, process_ignored_command, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, process_ignored_command, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 30 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 40 - process_card_search, NULL, NULL, NULL, - process_ignored_command, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + process_card_search, nullptr, nullptr, nullptr, + process_ignored_command, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // 50 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 60 - process_game_command, process_player_data, process_game_command, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_game_command, process_game_command, NULL, process_client_ready, + process_game_command, process_player_data, process_game_command, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_game_command, process_game_command, nullptr, process_client_ready, // 70 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // 80 - NULL, process_simple_mail, NULL, NULL, - process_change_lobby, NULL, NULL, NULL, - NULL, process_change_arrow_color, process_lobby_name_request, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_simple_mail, nullptr, nullptr, + process_change_lobby, nullptr, nullptr, nullptr, + nullptr, process_change_arrow_color, process_lobby_name_request, nullptr, + nullptr, nullptr, nullptr, nullptr, // 90 - NULL, NULL, NULL, process_login_bb, - NULL, NULL, NULL, NULL, - process_player_data, process_ignored_command, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, process_login_bb, + nullptr, nullptr, nullptr, nullptr, + process_player_data, process_ignored_command, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // A0 - process_change_ship, process_change_block, process_quest_list_request, NULL, - NULL, NULL, NULL, NULL, - NULL, process_ignored_command, NULL, NULL, - process_quest_ready, NULL, NULL, NULL, + process_change_ship, process_change_block, process_quest_list_request, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr, process_ignored_command, nullptr, nullptr, + process_quest_ready, nullptr, nullptr, nullptr, // B0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, // C0 - NULL, process_create_game_bb, NULL, NULL, - NULL, NULL, process_set_blocked_list, process_set_auto_reply_pc_bb, - process_disable_auto_reply, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, process_create_game_bb, nullptr, nullptr, + nullptr, nullptr, process_set_blocked_list, process_set_auto_reply_pc_bb, + process_disable_auto_reply, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, // D0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - process_info_board_request, process_write_info_board_pc_bb, NULL, NULL, - process_guild_card_data_request_bb, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + process_info_board_request, process_write_info_board_pc_bb, nullptr, nullptr, + process_guild_card_data_request_bb, nullptr, nullptr, nullptr, // E0 - process_key_config_request_bb, NULL, NULL, process_player_preview_request_bb, - NULL, process_create_character_bb, NULL, process_return_player_data_bb, - process_client_checksum_bb, NULL, process_team_command_bb, process_stream_file_request_bb, - process_ignored_command, process_change_account_data_bb, NULL, NULL, + process_key_config_request_bb, nullptr, nullptr, process_player_preview_request_bb, + nullptr, process_create_character_bb, nullptr, process_return_player_data_bb, + process_client_checksum_bb, nullptr, process_team_command_bb, process_stream_file_request_bb, + process_ignored_command, process_change_account_data_bb, nullptr, nullptr, // F0 - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; static process_command_t patch_handlers[0x100] = { // 00 - NULL, NULL, process_encryption_ok_patch, NULL, - process_login_patch, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + nullptr, nullptr, process_encryption_ok_patch, nullptr, + process_login_patch, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 10 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 20 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 30 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 40 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 50 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 60 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 70 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 80 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 90 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // A0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // B0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // C0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // D0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // E0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // F0 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + // 10 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 20 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 30 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 40 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 50 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 60 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 70 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 80 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // 90 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // A0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // B0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // C0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // D0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // E0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + // F0 + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, }; static process_command_t* handlers[6] = { diff --git a/src/ReceiveSubcommands.cc b/src/ReceiveSubcommands.cc index bb407579..a2d7ca8d 100644 --- a/src/ReceiveSubcommands.cc +++ b/src/ReceiveSubcommands.cc @@ -758,7 +758,7 @@ static void process_subcommand_destroy_item(shared_ptr, if ((cmd->size != 3) || !l->is_game()) { return; } - l->remove_item(cmd->item_id, NULL); + l->remove_item(cmd->item_id, nullptr); } forward_subcommand(l, c, command, flag, p, count); diff --git a/src/SendCommands.cc b/src/SendCommands.cc index bb911f81..85f1f711 100644 --- a/src/SendCommands.cc +++ b/src/SendCommands.cc @@ -92,7 +92,7 @@ void send_command_excluding_client(shared_ptr l, shared_ptr c, void send_command(shared_ptr l, uint16_t command, uint32_t flag, const void* data, size_t size) { - send_command_excluding_client(l, NULL, command, flag, data, size); + send_command_excluding_client(l, nullptr, command, flag, data, size); } void send_command(shared_ptr s, uint16_t command, uint32_t flag, diff --git a/src/SendCommands.hh b/src/SendCommands.hh index 2839b6d7..d8fd4161 100644 --- a/src/SendCommands.hh +++ b/src/SendCommands.hh @@ -31,17 +31,17 @@ void send_command(std::shared_ptr c, uint16_t command, - uint32_t flag = 0, const void* data = NULL, size_t size = 0); + uint32_t flag = 0, const void* data = nullptr, size_t size = 0); void send_command_excluding_client(std::shared_ptr l, std::shared_ptr c, uint16_t command, uint32_t flag = 0, - const void* data = NULL, size_t size = 0); + const void* data = nullptr, size_t size = 0); void send_command(std::shared_ptr l, uint16_t command, uint32_t flag = 0, - const void* data = NULL, size_t size = 0); + const void* data = nullptr, size_t size = 0); void send_command(std::shared_ptr s, uint16_t command, - uint32_t flag = 0, const void* data = NULL, size_t size = 0); + uint32_t flag = 0, const void* data = nullptr, size_t size = 0); template void send_command(std::shared_ptr c, uint16_t command, uint32_t flag, diff --git a/src/Server.cc b/src/Server.cc index 6bf3be0a..cb5151d4 100644 --- a/src/Server.cc +++ b/src/Server.cc @@ -34,7 +34,7 @@ void Server::disconnect_client(struct bufferevent* bev) { void Server::disconnect_client(shared_ptr c) { this->bev_to_client.erase(c->bev); struct bufferevent* bev = c->bev; - c->bev = NULL; + c->bev = nullptr; int fd = bufferevent_getfd(bev); if (fd < 0) { @@ -52,7 +52,7 @@ void Server::disconnect_client(shared_ptr c) { } else { // the callbacks will free it when all the data is sent or the client // disconnects - bufferevent_setcb(bev, NULL, + bufferevent_setcb(bev, nullptr, Server::dispatch_on_disconnecting_client_output, Server::dispatch_on_disconnecting_client_error, this); bufferevent_disable(bev, EV_READ); @@ -114,7 +114,7 @@ void Server::on_listen_accept(struct evconnlistener* listener, listening_socket->behavior)); this->bev_to_client.emplace(make_pair(bev, c)); - bufferevent_setcb(bev, &Server::dispatch_on_client_input, NULL, + bufferevent_setcb(bev, &Server::dispatch_on_client_input, nullptr, &Server::dispatch_on_client_error, this); bufferevent_enable(bev, EV_READ | EV_WRITE); @@ -136,7 +136,7 @@ void Server::connect_client( sin->sin_addr.s_addr = htonl(address); sin->sin_port = htons(port); - bufferevent_setcb(bev, &Server::dispatch_on_client_input, NULL, + bufferevent_setcb(bev, &Server::dispatch_on_client_input, nullptr, &Server::dispatch_on_client_error, this); bufferevent_enable(bev, EV_READ | EV_WRITE); @@ -147,7 +147,7 @@ void Server::on_listen_error(struct evconnlistener* listener) { int err = EVUTIL_SOCKET_ERROR(); log(ERROR, "[Server] Failure on listening socket %d: %d (%s)", evconnlistener_get_fd(listener), err, evutil_socket_error_to_string(err)); - event_base_loopexit(this->base.get(), NULL); + event_base_loopexit(this->base.get(), nullptr); } void Server::on_client_input(struct bufferevent* bev) { diff --git a/src/ServerState.cc b/src/ServerState.cc index afc389c5..5ecfd4fd 100644 --- a/src/ServerState.cc +++ b/src/ServerState.cc @@ -134,7 +134,7 @@ shared_ptr ServerState::find_client(const char16_t* identifier, if ((serial_number == 0) && identifier) { try { string encoded = encode_sjis(identifier); - serial_number = stoull(encoded, NULL, 0); + serial_number = stoull(encoded, nullptr, 0); } catch (const exception&) { } } diff --git a/src/ServerState.hh b/src/ServerState.hh index d004b635..f1c59ed7 100644 --- a/src/ServerState.hh +++ b/src/ServerState.hh @@ -77,8 +77,8 @@ struct ServerState { void add_lobby(std::shared_ptr l); void remove_lobby(uint32_t lobby_id); - std::shared_ptr find_client(const char16_t* identifier = NULL, - uint64_t serial_number = 0, std::shared_ptr l = NULL); + std::shared_ptr find_client(const char16_t* identifier = nullptr, + uint64_t serial_number = 0, std::shared_ptr l = nullptr); uint32_t connect_address_for_client(std::shared_ptr c); diff --git a/src/Shell.cc b/src/Shell.cc index c62d4151..a276844a 100644 --- a/src/Shell.cc +++ b/src/Shell.cc @@ -20,7 +20,7 @@ Shell::Shell(std::shared_ptr base, &Shell::dispatch_read_stdin, this), event_free), prompt_event(event_new(this->base.get(), 0, EV_TIMEOUT, &Shell::dispatch_print_prompt, this), event_free) { - event_add(this->read_event.get(), NULL); + event_add(this->read_event.get(), nullptr); // schedule an event to print the prompt as soon as the event loop starts // running. we do this so the prompt appears after any initialization @@ -61,7 +61,7 @@ void Shell::read_stdin() { if (!any_command_read) { // ctrl+d probably; we should exit fputc('\n', stderr); - event_base_loopexit(this->base.get(), NULL); + event_base_loopexit(this->base.get(), nullptr); return; } else { break; // probably not EOF; just no more commands for now @@ -82,7 +82,7 @@ void Shell::read_stdin() { try { execute_command(command); } catch (const exit_shell&) { - event_base_loopexit(this->base.get(), NULL); + event_base_loopexit(this->base.get(), nullptr); return; } catch (const exception& e) { fprintf(stderr, "FAILED: %s\n", e.what()); diff --git a/src/Text.cc b/src/Text.cc index 370bfd34..19bddcd3 100644 --- a/src/Text.cc +++ b/src/Text.cc @@ -63,8 +63,8 @@ static void load_sjis_tables() { if (tokens.size() < 2) { continue; } - char16_t sjis_char = stoul(tokens[0], NULL, 0); - char16_t unicode_char = stoul(tokens[1], NULL, 0); + char16_t sjis_char = stoul(tokens[0], nullptr, 0); + char16_t unicode_char = stoul(tokens[1], nullptr, 0); unicode_to_sjis_table_data[unicode_char] = sjis_char; sjis_to_unicode_table_data[sjis_char] = unicode_char;