From 6b3cc6971ddef462e50eea6e493ca533f696712d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sat, 25 Nov 2023 18:11:01 +0100 Subject: [PATCH] Don't free() allocated statics --- po/pl.po | 8 ++++---- src/zfs.cpp | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/pl.po b/po/pl.po index a5c6b85..d4abff3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -157,22 +157,22 @@ msgstr "klucza zawijania %2$s dla %1$s" msgid "Couldn't unseal wrapping key with PCR policy: %s\n" msgstr "Nie udało się rozpieczętować klucza zawijania z polityką PCR: %s\n" -#: src/zfs.cpp:101 +#: src/zfs.cpp:98 #, c-format msgid "You might need to run \"zfs inherit %s %s\" and \"zfs inherit %s %s\" to fully clear metadata!\n" msgstr "Możliwe, że potrzebujesz uruchomić \"zfs inherit %s %s\" i \"zfs inherit %s %s\" żeby całkowicie pozbyć się metadanych!\n" -#: src/zfs.cpp:116 +#: src/zfs.cpp:113 #, c-format msgid "Dataset %s not encrypted with tzpfms!\n" msgstr "Dataset %s nie jest szyfrowany tzpfms!\n" -#: src/zfs.cpp:118 +#: src/zfs.cpp:115 #, c-format msgid "Dataset %s encrypted with tzpfms back-end %s, but we are %s.\n" msgstr "Dataset %s szyfrowany tzpfms %s, ale ten program rozumie %s.\n" -#: src/zfs.cpp:122 +#: src/zfs.cpp:119 #, c-format msgid "Dataset %s missing key data.\n" msgstr "Dataset %s nie ma klucza.\n" diff --git a/src/zfs.cpp b/src/zfs.cpp index 196340d..69cceb6 100644 --- a/src/zfs.cpp +++ b/src/zfs.cpp @@ -10,10 +10,8 @@ #include -// Funxion statics pull in libc++'s __cxa_guard_acquire() -static nvlist_t * rrargs{}; -static quickscope_wrapper rrargs_deleter{[] { nvlist_free(rrargs); }}; nvlist_t * rewrap_args() { + static nvlist_t * rrargs; if(!rrargs) if(auto err = [&] { @@ -33,9 +31,8 @@ nvlist_t * rewrap_args() { } -static nvlist_t * crrargs{}; -static quickscope_wrapper crrargs_deleter{[] { nvlist_free(crrargs); }}; nvlist_t * clear_rewrap_args() { + static nvlist_t * crrargs; if(!crrargs) if(auto err = [&] {