From: Holger Schemel Date: Mon, 19 Feb 2024 22:50:11 +0000 (+0100) Subject: replaced glib function calls to g_strfreev() X-Git-Tag: 4.4.0.0-test-1~337 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ec529b5df69b376a1d55e38862975b7d9a26ea97;hp=c712eddd108764ffbf523830ba2a26869e1453c8;p=rocksndiamonds.git replaced glib function calls to g_strfreev() --- diff --git a/src/game_bd/bd_bdcff.c b/src/game_bd/bd_bdcff.c index 8b7164b9..9972b7f2 100644 --- a/src/game_bd/bd_bdcff.c +++ b/src/game_bd/bd_bdcff.c @@ -330,7 +330,7 @@ static boolean struct_set_property(gpointer str, const GdStructDescriptor *prop_ if (identifier_found && !was_string && paramindex < paramcount) Warn("excess parameters for attribute '%s': '%s'", attrib, params[paramindex]); - g_strfreev(params); + freeStringArray(params); return identifier_found; } @@ -352,7 +352,7 @@ static boolean replay_store_more_from_bdcff(GdReplay *replay, const char *param) for (i = 0; split[i] != 0; i++) result = result && replay_store_from_bdcff(replay, split[i]); - g_strfreev(split); + freeStringArray(split); return result; } @@ -482,7 +482,7 @@ static boolean cave_process_tags_func(const char *attrib, const char *param, GdC identifier_found = struct_set_property(cave, gd_cave_properties, attrib, param, cave->w * cave->h); } - g_strfreev(params); + freeStringArray(params); /* a ghrfunc should return true if the identifier is to be removed */ return identifier_found; @@ -1095,7 +1095,7 @@ boolean gd_caveset_load_from_bdcff(const char *contents) else Warn("invalid effect specification '%s'", param); - g_strfreev(params); + freeStringArray(params); } else { @@ -1149,7 +1149,7 @@ boolean gd_caveset_load_from_bdcff(const char *contents) Warn(_("Invalid BDCFF: [game] section has drawing objects defined")); /* cleanup */ - g_strfreev (lines); + freeStringArray(lines); g_hash_table_destroy(tags); g_hash_table_destroy(replay_tags); gd_cave_free(default_cave); diff --git a/src/game_bd/bd_caveobject.c b/src/game_bd/bd_caveobject.c index c0202397..748de2be 100644 --- a/src/game_bd/bd_caveobject.c +++ b/src/game_bd/bd_caveobject.c @@ -615,7 +615,7 @@ GdObject *gd_object_new_from_string(char *str) return NULL; if (words) - g_strfreev(words); + freeStringArray(words); words = getSplitStringArray(param, " ", -1); l = g_strv_length(words);