From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778AbdKUKBT (ORCPT ); Tue, 21 Nov 2017 05:01:19 -0500 Received: from mout.web.de ([212.227.17.12]:58498 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbdKUKBQ (ORCPT ); Tue, 21 Nov 2017 05:01:16 -0500 To: linux-kselftest@vger.kernel.org, Frederic Weisbecker , John Stultz , Shuah Khan , Stephen Boyd , Thomas Gleixner Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] selftests: posix_timers: Use common error handling code in two functions Message-ID: <3ce187fa-a6df-a419-6924-ea12bf837972@users.sourceforge.net> Date: Tue, 21 Nov 2017 11:00:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:kmvq/W6ImKdq4w/DRKFWJXyWRJqsAKJ/LAxlVMhIIBkrHvoFG7e x1/sT6+mu72H/OEvlLis9mUNTOcfljlbJXeJg19eV29WO+D8WNJhRlGoYklg5tjMQOgDZKg UPfCAvZkvPVP7nLizFqsTxq6sA3kH248Bb+JsmhFFN75kdjwxvkhTDj53Zv+EFNqLEMChQq H0BEakUsdKffejwRynukA== X-UI-Out-Filterresults: notjunk:1;V01:K0:6aqVsYUigtI=:Y4U1ty9U04SJW0K8IiMlda xK/czupAixQBFvtt9uXh4+se/N8X5xsdQZspvO0XSkuma3nEomtlWZ3fcVWmUbnO8cbWVIwwP QSwk6yS7suJ1OfjB5FWxSGV1/QTGnyUB+PoPh8zbh/4z2y9mIWTw7LRTnWDd0rsY1Uvdj3JDw vQnQQswVhD5j9jMW4ACfSGEKFzoM4+7+dFd4+9t0bgpN9LYcFxJIkadXOYRYHzjTxYKPg2MGo 9+aWaCsq1euQdLxfnmNL+WBWO83CaeMgenDsMHxrnHESCWw8fwLOTOaMhL4M6S3aOPb+2SgXe 7BpZq8GLjPB5OKZdoP+4j5BpJaBESQyJ2DC+kuBdN/39Tt70kF2q20ERSa8KLxduoJgp4LRbO jRMbPuZjj11avKLLLeUgyQDan6yrBIs0xWrnUHI3/H6K03dJWNPoCYF4hXNNrwR+7BZ3ECIrA OakPB4fUlGNZ4gvkI7E5DVNCmJg68pWvPi7HnpcZOmie5etJqUQFDrUU5M8RAOOEFyGcyb5Wu 5Bx6occGvTynF083agIPHdsA/M92J+nvOj9sts3WIFw+7hWWat6qzcu/wpO3D+4j9eLN4uvkb OEn2LSz3DvSA86RAftY+O0GO2E7AT3wrpA9/IkeujWZdNljRevAl0h2mC/LCnrFjT7TkGuHFf EU3HQLqBaGTTWvHUZFccHLTudgWkNQzjMM9L7cxc0YvTuZKCYvYZaBb/+iMYbieFBR2qdHyg8 ca5Xrbtwi1BNCJzJRc6Q6BWJ8oBK4rFsbxcmaK6ECvBJk3K4+9raqq7p2AVuNnBL8xAPiTmh4 uh+UHqmIcFgoX2e1LKH6kY54+kxqDTSNO2EJ8MV0OdQAAHfaEc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 21 Nov 2017 10:50:32 +0100 Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- tools/testing/selftests/timers/posix_timers.c | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c index 15cf56d32155..5c9fbb06194f 100644 --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c @@ -104,10 +104,8 @@ static int check_itimer(int which) signal(SIGALRM, sig_handler); err = gettimeofday(&start, NULL); - if (err < 0) { - perror("Can't call gettimeofday()\n"); - return -1; - } + if (err < 0) + goto report_failure; err = setitimer(which, &val, NULL); if (err < 0) { @@ -123,10 +121,8 @@ static int check_itimer(int which) idle_loop(); err = gettimeofday(&end, NULL); - if (err < 0) { - perror("Can't call gettimeofday()\n"); - return -1; - } + if (err < 0) + goto report_failure; if (!check_diff(start, end)) printf("[OK]\n"); @@ -134,6 +130,10 @@ static int check_itimer(int which) printf("[FAIL]\n"); return 0; + +report_failure: + perror("Can't call gettimeofday()\n"); + return -1; } static int check_timer_create(int which) @@ -162,10 +162,8 @@ static int check_timer_create(int which) signal(SIGALRM, sig_handler); err = gettimeofday(&start, NULL); - if (err < 0) { - perror("Can't call gettimeofday()\n"); - return -1; - } + if (err < 0) + goto report_failure; err = timer_settime(id, 0, &val, NULL); if (err < 0) { @@ -176,10 +174,8 @@ static int check_timer_create(int which) user_loop(); err = gettimeofday(&end, NULL); - if (err < 0) { - perror("Can't call gettimeofday()\n"); - return -1; - } + if (err < 0) + goto report_failure; if (!check_diff(start, end)) printf("[OK]\n"); @@ -187,6 +183,10 @@ static int check_timer_create(int which) printf("[FAIL]\n"); return 0; + +report_failure: + perror("Can't call gettimeofday()\n"); + return -1; } int main(int argc, char **argv) -- 2.15.0