picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

analyze: use static destructors

This commit is contained in:
Yu Watanabe 2018-11-20 15:13:16 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 3be1cabe98
commit d665c7b2db
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/analyze/analyze.c
View File

@ -26,6 +26,7 @@
#include "hashmap.h"
#include "locale-util.h"
#include "log.h"
#include "main-func.h"
#include "pager.h"
#include "parse-util.h"
#include "path-util.h"
@ -75,6 +76,9 @@ static bool arg_man = true;
static bool arg_generators = false;
static const char *arg_root = NULL;
STATIC_DESTRUCTOR_REGISTER(arg_dot_from_patterns, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_dot_to_patterns, strv_freep);
struct boot_times {
usec_t firmware_time;
usec_t loader_time;
@ -1989,7 +1993,7 @@ static int parse_argv(int argc, char *argv[]) {
return 1; /* work to do */
}
int main(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
static const Verb verbs[] = {
{ "help", VERB_ANY, VERB_ANY, 0, help },
@ -2026,15 +2030,9 @@ int main(int argc, char *argv[]) {
r = parse_argv(argc, argv);
if (r <= 0)
goto finish;
return r;
r = dispatch_verb(argc, argv, verbs, NULL);
finish:
pager_close();
strv_free(arg_dot_from_patterns);
strv_free(arg_dot_to_patterns);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
return dispatch_verb(argc, argv, verbs, NULL);
}
DEFINE_MAIN_FUNCTION(run);