shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-24 02:03:54 +03:00
Code

journalctl: Use STATIC_DESTRUCTOR_REGISTER()

Browse Source
This commit is contained in:
Daan De Meyer 2022-06-06 16:04:53 +02:00
parent e30c1d01b6
commit 2e64b27aeb
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/journal/journalctl.c
View File

@ -65,6 +65,7 @@
#include "rlimit-util.h"
#include "set.h"
#include "sigbus.h"
#include "static-destruct.h"
#include "stdio-util.h"
#include "string-table.h"
#include "strv.h"
@ -138,6 +139,19 @@ static pcre2_code *arg_compiled_pattern = NULL;
static int arg_case_sensitive = -1; /* -1 means be smart */
#endif
STATIC_DESTRUCTOR_REGISTER(arg_file, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_facilities, set_freep);
STATIC_DESTRUCTOR_REGISTER(arg_verify_key, freep);
STATIC_DESTRUCTOR_REGISTER(arg_syslog_identifier, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_system_units, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_user_units, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
STATIC_DESTRUCTOR_REGISTER(arg_output_fields, strv_freep);
#if HAVE_PCRE2
STATIC_DESTRUCTOR_REGISTER(arg_compiled_pattern, sym_pcre2_code_freep);
#endif
static enum {
ACTION_SHOW,
ACTION_NEW_ID128,
@ -2814,28 +2828,13 @@ int main(int argc, char *argv[]) {
finish:
pager_close();
strv_free(arg_file);
set_free(arg_facilities);
strv_free(arg_syslog_identifier);
strv_free(arg_system_units);
strv_free(arg_user_units);
strv_free(arg_output_fields);
free(arg_root);
free(arg_verify_key);
#if HAVE_PCRE2
if (arg_compiled_pattern) {
sym_pcre2_code_free(arg_compiled_pattern);
if (arg_compiled_pattern && r == 0 && n_shown == 0)
/* --grep was used, no error was thrown, but the pattern didn't
* match anything. Let's mimic grep's behavior here and return
* a non-zero exit code, so journalctl --grep can be used
* in scripts and such */
if (r == 0 && n_shown == 0)
r = -ENOENT;
}
r = -ENOENT;
#endif
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;