From 12530722bb174eecb8b349b551a2b6d537372700 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 26 Sep 2026 02:07:48 +0300 Subject: [PATCH 71/71] scripting/: Replace NULL with nullptr See RM #2286 Signed-off-by: Marko Lindqvist --- server/scripting/api_fcdb_auth.c | 14 ++++++++------ server/scripting/api_fcdb_base.c | 4 ++-- server/scripting/api_server_base.c | 12 ++++++------ server/scripting/api_server_luadata.c | 9 +++++---- server/scripting/api_server_notify.c | 4 ++-- server/scripting/tolua_server.pkg | 6 +++--- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/server/scripting/api_fcdb_auth.c b/server/scripting/api_fcdb_auth.c index 00db45e097..c4fd184b65 100644 --- a/server/scripting/api_fcdb_auth.c +++ b/server/scripting/api_fcdb_auth.c @@ -38,9 +38,10 @@ **************************************************************************/ const char *api_auth_get_username(lua_State *L, Connection *pconn) { - LUASCRIPT_CHECK_STATE(L, NULL); - LUASCRIPT_CHECK_SELF(L, pconn, NULL); - fc_assert_ret_val(conn_is_valid(pconn), NULL); + LUASCRIPT_CHECK_STATE(L, nullptr); + LUASCRIPT_CHECK_SELF(L, pconn, nullptr); + + fc_assert_ret_val(conn_is_valid(pconn), nullptr); return auth_get_username(pconn); } @@ -50,9 +51,10 @@ const char *api_auth_get_username(lua_State *L, Connection *pconn) **************************************************************************/ const char *api_auth_get_ipaddr(lua_State *L, Connection *pconn) { - LUASCRIPT_CHECK_STATE(L, NULL); - LUASCRIPT_CHECK_SELF(L, pconn, NULL); - fc_assert_ret_val(conn_is_valid(pconn), NULL); + LUASCRIPT_CHECK_STATE(L, nullptr); + LUASCRIPT_CHECK_SELF(L, pconn, nullptr); + + fc_assert_ret_val(conn_is_valid(pconn), nullptr); return auth_get_ipaddr(pconn); } diff --git a/server/scripting/api_fcdb_base.c b/server/scripting/api_fcdb_base.c index 76dc1f3d80..ecdffe9f7f 100644 --- a/server/scripting/api_fcdb_base.c +++ b/server/scripting/api_fcdb_base.c @@ -33,8 +33,8 @@ **************************************************************************/ const char *api_fcdb_option(lua_State *L, const char *type) { - LUASCRIPT_CHECK_STATE(L, NULL); - LUASCRIPT_CHECK_ARG_NIL(L, type, 2, string, NULL); + LUASCRIPT_CHECK_STATE(L, nullptr); + LUASCRIPT_CHECK_ARG_NIL(L, type, 2, string, nullptr); if (!fc_strncasecmp(OPTION_DEPR_PREFIX, type, strlen(OPTION_DEPR_PREFIX))) { diff --git a/server/scripting/api_server_base.c b/server/scripting/api_server_base.c index fc8653b33b..b94cf3930c 100644 --- a/server/scripting/api_server_base.c +++ b/server/scripting/api_server_base.c @@ -60,7 +60,7 @@ bool api_server_save(lua_State *L, const char *filename) LUASCRIPT_CHECK_STATE(L, FALSE); /* Limit the allowed characters in the filename. */ - if (filename != NULL && !is_safe_filename(filename)) { + if (filename != nullptr && !is_safe_filename(filename)) { return FALSE; } @@ -106,21 +106,21 @@ bool api_popup_image(lua_State *L, Player *pplayer, const char *tag) } /**********************************************************************//** - Return the formatted value of the setting or NULL if no such setting - exists. + Return the formatted value of the setting or nullptr if no such + setting exists. **************************************************************************/ const char *api_server_setting_get(lua_State *L, const char *sett_name) { struct setting *pset; static char buf[512]; - LUASCRIPT_CHECK_STATE(L, NULL); - LUASCRIPT_CHECK_ARG_NIL(L, sett_name, 2, API_TYPE_STRING, NULL); + LUASCRIPT_CHECK_STATE(L, nullptr); + LUASCRIPT_CHECK_ARG_NIL(L, sett_name, 2, API_TYPE_STRING, nullptr); pset = setting_by_name(sett_name); if (!pset) { - return NULL; + return nullptr; } return setting_value_name(pset, FALSE, buf, sizeof(buf)); diff --git a/server/scripting/api_server_luadata.c b/server/scripting/api_server_luadata.c index 23d626c80d..da770b14ac 100644 --- a/server/scripting/api_server_luadata.c +++ b/server/scripting/api_server_luadata.c @@ -34,11 +34,12 @@ **************************************************************************/ const char *api_luadata_get_str(lua_State *L, const char *field) { - LUASCRIPT_CHECK_STATE(L, NULL); + LUASCRIPT_CHECK_STATE(L, nullptr); - if (game.server.luadata == NULL) { - return NULL; + if (game.server.luadata == nullptr) { + return nullptr; } - return secfile_lookup_str_default(game.server.luadata, NULL, "%s", field); + return secfile_lookup_str_default(game.server.luadata, nullptr, + "%s", field); } diff --git a/server/scripting/api_server_notify.c b/server/scripting/api_server_notify.c index e5ca67b848..ae9ba935b8 100644 --- a/server/scripting/api_server_notify.c +++ b/server/scripting/api_server_notify.c @@ -63,7 +63,7 @@ void api_notify_research_msg(lua_State *L, Player *pplayer, pres = research_get(pplayer); - notify_research(pres, include_plr ? NULL : pplayer, event, + notify_research(pres, include_plr ? nullptr : pplayer, event, ftc_any, "%s", message); } @@ -79,5 +79,5 @@ void api_notify_research_embassies_msg(lua_State *L, Player *pplayer, pres = research_get(pplayer); - notify_research_embassies(pres, NULL, event, ftc_any, "%s", message); + notify_research_embassies(pres, nullptr, event, ftc_any, "%s", message); } diff --git a/server/scripting/tolua_server.pkg b/server/scripting/tolua_server.pkg index 87ec1b7007..31e56ee614 100644 --- a/server/scripting/tolua_server.pkg +++ b/server/scripting/tolua_server.pkg @@ -12,7 +12,7 @@ *****************************************************************************/ /***************************************************************************** - ADVERTISEMENT: do not attempt to change the name of the API functions. + ADVERTISEMENT: Do not attempt to change the name of the API functions. They may be in use in Lua scripts in savefiles, so once released, the name and signature cannot change shape even in new major versions of Freeciv, until the relevant save format version can no longer be loaded. @@ -250,7 +250,7 @@ module edit { void api_edit_player_give_bulbs @ give_bulbs(lua_State *L, Player *self, int amount, - Tech_Type *tech = NULL); + Tech_Type *tech = nullptr); bool api_edit_create_trade_route @ create_trade_route(lua_State *L, City *from, City *to); @@ -577,7 +577,7 @@ module Player { int api_methods_player_trait_current_mod @ trait_current_mod (lua_State *L, Player *pplayer, const char *tname); void api_methods_player_lose - @ lose (lua_State *L, Player *pplayer, Player *looter = NULL); + @ lose (lua_State *L, Player *pplayer, Player *looter = nullptr); int api_methods_player_tech_bulbs @ bulbs_saved (lua_State *L, Player *pplayer, Tech_Type *tech); -- 2.53.0