No point to libzfs_fini() as the last thing in main, either

This commit is contained in:
наб 2023-11-25 23:31:09 +01:00
parent b8b856870c
commit b3764d8626
No known key found for this signature in database
GPG Key ID: BCFD0B018D2658F1
2 changed files with 8 additions and 10 deletions

View File

@ -74,34 +74,34 @@ msgstr "Hasło za krótkie (maks. %u)\n"
msgid "Provided passphrases do not match.\n"
msgstr "Hasła się różnią\n"
#: src/main.hpp:46 src/main.hpp:59 src/main.hpp:64
#: src/main.hpp:44 src/main.hpp:57 src/main.hpp:62
#, c-format
msgid "usage: %s [-hV] %s%s%s\n"
msgstr "składnia: %s [-hV] %s%s%s\n"
#. as-in argument in a usage string
#: src/main.hpp:72
#: src/main.hpp:70
msgid "dataset"
msgstr "dataset"
#: src/main.hpp:76
#: src/main.hpp:74
#, c-format
msgid "No dataset to act on?\n"
"usage: %s [-hV] %s%sdataset\n"
msgstr "Nie podano datasetu?\n"
"składnia: %s [-hV] %s%sdataset\n"
#: src/main.hpp:81
#: src/main.hpp:79
#, c-format
msgid "usage: %s [-hV] %s%sdataset\n"
msgstr "składnia: %s [-hV] %s%sdataset\n"
#: src/main.hpp:91
#: src/main.hpp:89
#, c-format
msgid "Dataset %s not encrypted?\n"
msgstr "Dataset %s nie jest zaszyfrowany?\n"
#: src/main.hpp:93
#: src/main.hpp:91
#, c-format
msgid "Using dataset %s's encryption root %s instead.\n"
msgstr "Używam zamiast %s jego korzenia szyfrowania %s.\n"

View File

@ -27,13 +27,11 @@ static int do_bare_main(
int argc, char ** argv, const char * getoptions, const char * usage, const char * dataset_usage, G && getoptfn, M && main,
V && validate = []() { return 0; }) {
setlocale(LC_ALL, "");
// bindtextdomain("tzpfms", "/usr/share/locale");
bindtextdomain("tzpfms", "out/loc");
bindtextdomain("tzpfms", "/usr/share/locale");
// bindtextdomain("tzpfms", "out/loc");
textdomain("tzpfms");
const auto libz = TRY_PTR("initialise libzfs", libzfs_init());
quickscope_wrapper libz_deleter{[=] { libzfs_fini(libz); }};
libzfs_print_on_error(libz, B_TRUE);
auto gopts = reinterpret_cast<char *>(alloca(strlen(getoptions) + 2 + 1));