From: Federico Kircheis Date: Sat, 29 Jun 2019 13:09:54 +0000 (+0200) Subject: Replace `catch` variable with `restore` X-Git-Tag: 2019-10-25~149^2~26 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d665f658db135c629e2c7297300d185d719f5686;p=neomutt Replace `catch` variable with `restore` `catch` is a reserved keyword in c++ --- diff --git a/mutt/signal.c b/mutt/signal.c index 826a12f75..c26a4db8b 100644 --- a/mutt/signal.c +++ b/mutt/signal.c @@ -202,15 +202,15 @@ void mutt_sig_block_system(void) /** * mutt_sig_unblock_system - Restore previously blocked signals - * @param catch If true, restore previous SIGINT, SIGQUIT behaviour + * @param restore If true, restore previous SIGINT, SIGQUIT behaviour */ -void mutt_sig_unblock_system(bool catch) +void mutt_sig_unblock_system(bool restore) { if (!SysSignalsBlocked) return; sigprocmask(SIG_UNBLOCK, &SigsetSys, NULL); - if (catch) + if (restore) { sigaction(SIGQUIT, &SysOldQuit, NULL); sigaction(SIGINT, &SysOldInt, NULL); diff --git a/mutt/signal2.h b/mutt/signal2.h index f6ddeec3a..9f4f649cf 100644 --- a/mutt/signal2.h +++ b/mutt/signal2.h @@ -38,6 +38,6 @@ void mutt_sig_empty_handler(int sig); void mutt_sig_exit_handler(int sig); void mutt_sig_init(sig_handler_t sig_fn, sig_handler_t exit_fn, sig_handler_t segv_fn); void mutt_sig_unblock(void); -void mutt_sig_unblock_system(bool catch); +void mutt_sig_unblock_system(bool restore); #endif /* MUTT_LIB_SIGNAL_H */