From patchwork Fri Dec 18 14:28:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 7885261 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B62BBEEE5 for ; Fri, 18 Dec 2015 14:30:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62A3F20445 for ; Fri, 18 Dec 2015 14:30:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61A3120426 for ; Fri, 18 Dec 2015 14:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964877AbbLRO35 (ORCPT ); Fri, 18 Dec 2015 09:29:57 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:33721 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933216AbbLRO3e (ORCPT ); Fri, 18 Dec 2015 09:29:34 -0500 Received: by mail-wm0-f42.google.com with SMTP id p187so67213048wmp.0 for ; Fri, 18 Dec 2015 06:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TA5LNGImHVEhRUEr4y3lhnogZiqt0rTllP847XEoNTg=; b=BT3hLEoDYYyJum7rTi7jemTaz8OG338yd7FjcHjlDpD4rBNonOpQtw7HopsMgX8igp H3KbptSJsKuSbF93EAR56kTE0wOWuvWw8eBnaBAXAiL3KDQKVkcLf75V6QTAKJ2JjugX RhMfiuP4XiDCBO48p5Xmmr8iSyOB71PJodWuN60yIGgMEKaGdqn8fHnsnyngameqNt+0 9CGjiAdSbvz6LSwtFa9AhG3L/Gw5NYUlNYHCVfTz0XMZkeaZWnJhpUXjnUjLqAzHixuX 6G378+BlgKSEu4niRndNeYuSM2UbbsgZnUDiqaLLxoIqksfJDa7ujkF6l3/ZBtpaFAqM vsMg== X-Received: by 10.194.175.170 with SMTP id cb10mr5218860wjc.36.1450448973778; Fri, 18 Dec 2015 06:29:33 -0800 (PST) Received: from localhost.brock (navahotech.plus.com. [84.92.64.232]) by smtp.gmail.com with ESMTPSA id 67sm6927998wmm.6.2015.12.18.06.29.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Dec 2015 06:29:33 -0800 (PST) From: Jemma Denson To: mchehab@osg.samsung.com Cc: linux-media@vger.kernel.org Subject: [v4l-utils PATCH-v2 4/4] dvbv5-zap.c: Move common signals code into function Date: Fri, 18 Dec 2015 14:28:26 +0000 Message-Id: <1450448906-17000-5-git-send-email-jdenson@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1450448906-17000-1-git-send-email-jdenson@gmail.com> References: <1450448906-17000-1-git-send-email-jdenson@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Code repeated 3 times; move to common function. Signed-off-by: Jemma Denson --- utils/dvb/dvbv5-zap.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c index 2d71307..ef17be9 100644 --- a/utils/dvb/dvbv5-zap.c +++ b/utils/dvb/dvbv5-zap.c @@ -737,6 +737,16 @@ int do_traffic_monitor(struct arguments *args, return 0; } +static void set_signals(struct arguments *args) +{ + signal(SIGTERM, do_timeout); + signal(SIGINT, do_timeout); + if (args->timeout > 0) { + signal(SIGALRM, do_timeout); + alarm(args->timeout); + } +} + int main(int argc, char **argv) { struct arguments args; @@ -855,26 +865,14 @@ int main(int argc, char **argv) goto err; if (args.exit_after_tuning) { - signal(SIGTERM, do_timeout); - signal(SIGINT, do_timeout); - if (args.timeout > 0) { - signal(SIGALRM, do_timeout); - alarm(args.timeout); - } - + set_signals(&args); err = 0; check_frontend(&args, parms); goto err; } if (args.traffic_monitor) { - signal(SIGTERM, do_timeout); - signal(SIGINT, do_timeout); - if (args.timeout > 0) { - signal(SIGALRM, do_timeout); - alarm(args.timeout); - } - + set_signals(&args); err = do_traffic_monitor(&args, parms); goto err; } @@ -966,12 +964,7 @@ int main(int argc, char **argv) goto err; } - signal(SIGTERM, do_timeout); - signal(SIGINT, do_timeout); - if (args.timeout > 0) { - signal(SIGALRM, do_timeout); - alarm(args.timeout); - } + set_signals(&args); if (!check_frontend(&args, parms)) { err = 1;