From patchwork Tue May 19 14:26:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 6438301 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 76D7D9F1C1 for ; Tue, 19 May 2015 14:27:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADF6C20562 for ; Tue, 19 May 2015 14:27:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C29AC203A5 for ; Tue, 19 May 2015 14:26:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B601B6E65F; Tue, 19 May 2015 07:26:57 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1356D6E65F for ; Tue, 19 May 2015 07:26:57 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 19 May 2015 07:26:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,458,1427785200"; d="scan'208";a="731785743" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by orsmga002.jf.intel.com with ESMTP; 19 May 2015 07:26:53 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Tue, 19 May 2015 15:26:50 +0100 Message-Id: <1432045610-15970-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t] libs/igt_core.c: Fix compile warnings in igt_core.c X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Fixed variables incorrectly declared as signed instead of unsigned. Fixed 'unused parameter' warning from signal handlers that were not using the signal parameter. v2: Addressed comments from Tim Gore Signed-off-by: Derek Morton --- lib/igt_core.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/igt_core.c b/lib/igt_core.c index 8a1a249..62b1e6a 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1104,7 +1104,7 @@ static pid_t helper_process_pids[] = static void reset_helper_process_list(void) { - for (int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) + for (unsigned int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) helper_process_pids[i] = -1; helper_process_count = 0; } @@ -1121,8 +1121,10 @@ static int __waitpid(pid_t pid) static void fork_helper_exit_handler(int sig) { + (void)sig; /* Not used, suppress warning */ + /* Inside a signal handler, play safe */ - for (int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) { + for (unsigned int i = 0; i < ARRAY_SIZE(helper_process_pids); i++) { pid_t pid = helper_process_pids[i]; if (pid != -1) { kill(pid, SIGTERM); @@ -1227,6 +1229,8 @@ static void children_exit_handler(int sig) { int status; + (void)sig; /* Not used, suppress warning */ + /* The exit handler can be called from a fatal signal, so play safe */ while (num_test_children-- && wait(&status)) ; @@ -1376,10 +1380,10 @@ static void restore_sig_handler(int sig_num) static void restore_all_sig_handler(void) { - int i; + unsigned int i; for (i = 0; i < ARRAY_SIZE(orig_sig); i++) - restore_sig_handler(i); + restore_sig_handler((int)i); } static void call_exit_handlers(int sig) @@ -1419,7 +1423,7 @@ static bool crash_signal(int sig) static void fatal_sig_handler(int sig) { - int i; + unsigned int i; for (i = 0; i < ARRAY_SIZE(handled_signals); i++) { if (handled_signals[i].number != sig) @@ -1481,7 +1485,7 @@ static void fatal_sig_handler(int sig) */ void igt_install_exit_handler(igt_exit_handler_t fn) { - int i; + unsigned int i; for (i = 0; i < exit_handler_count; i++) if (exit_handler_fn[i] == fn) @@ -1521,7 +1525,7 @@ err: void igt_disable_exit_handler(void) { sigset_t set; - int i; + unsigned int i; if (exit_handler_disabled) return; @@ -1724,6 +1728,8 @@ out: static void igt_alarm_handler(int signal) { + (void)signal; /* Not used, suppress warning */ + igt_info("Timed out\n"); /* exit with failure status */