X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Ffatal-signal.c;h=81f8f284424099e6c4bac28f0e195556dc73f920;hb=6e11a6a15519561d932a018b2ca19dc3acee87c2;hp=2e38fc51aca1fc8b0e2c5d71f3fc8deff36a6abc;hpb=b302749b70bd8b487bdfe0ffcdacbf730da8b6ca;p=openvswitch diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index 2e38fc51..81f8f284 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -28,10 +28,10 @@ #include "shash.h" #include "socket-util.h" #include "util.h" - -#define THIS_MODULE VLM_fatal_signal #include "vlog.h" +VLOG_DEFINE_THIS_MODULE(fatal_signal); + /* Signals to catch. */ static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM }; @@ -215,9 +215,7 @@ fatal_signal_add_file_to_unlink(const char *file) fatal_signal_add_hook(unlink_files, cancel_files, NULL, true); } - if (!shash_find(&files, file)) { - shash_add(&files, file, NULL); - } + shash_add_once(&files, file, NULL); } /* Unregisters 'file' from being unlinked when the program terminates via @@ -251,7 +249,7 @@ fatal_signal_unlink_file_now(const char *file) static void unlink_files(void *aux OVS_UNUSED) { - do_unlink_files(); + do_unlink_files(); } static void