From patchwork Thu Jun 16 09:47:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9180363 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6B34E608A5 for ; Thu, 16 Jun 2016 09:51:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DF0320410 for ; Thu, 16 Jun 2016 09:51:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5322527D45; Thu, 16 Jun 2016 09:51:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F24532831C for ; Thu, 16 Jun 2016 09:51:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u5G9mJtP023193; Thu, 16 Jun 2016 05:48:19 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u5G9lvsm005686 for ; Thu, 16 Jun 2016 05:47:57 -0400 Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5G9lvwD008358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 16 Jun 2016 05:47:57 -0400 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A97580F6B; Thu, 16 Jun 2016 09:47:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C0047ADC0; Thu, 16 Jun 2016 09:47:52 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Thu, 16 Jun 2016 11:47:15 +0200 Message-Id: <1466070465-1021-10-git-send-email-hare@suse.de> In-Reply-To: <1466070465-1021-1-git-send-email-hare@suse.de> References: <1466070465-1021-1-git-send-email-hare@suse.de> X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 16 Jun 2016 09:47:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 16 Jun 2016 09:47:56 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'hare@suse.de' RCPT:'' X-RedHat-Spam-Score: -3.327 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Scanned-By: MIMEDefang 2.76 on 10.5.110.27 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 09/39] libmultipath/devmapper.c: Remove unused 'next' argument X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP Found by coverity. Signed-off-by: Hannes Reinecke --- libmultipath/devmapper.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 6e675fe..f395481 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -421,7 +421,6 @@ dm_get_map(const char * name, unsigned long long * size, char * outparams) { int r = 1; struct dm_task *dmt; - void *next = NULL; uint64_t start, length; char *target_type = NULL; char *params = NULL; @@ -438,8 +437,8 @@ dm_get_map(const char * name, unsigned long long * size, char * outparams) goto out; /* Fetch 1st target */ - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, ¶ms); + dm_get_next_target(dmt, NULL, &start, &length, + &target_type, ¶ms); if (size) *size = length; @@ -530,7 +529,6 @@ dm_get_status(char * name, char * outstatus) { int r = 1; struct dm_task *dmt; - void *next = NULL; uint64_t start, length; char *target_type; char *status; @@ -547,8 +545,8 @@ dm_get_status(char * name, char * outstatus) goto out; /* Fetch 1st target */ - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, &status); + dm_get_next_target(dmt, NULL, &start, &length, + &target_type, &status); if (snprintf(outstatus, PARAMS_SIZE, "%s", status) <= PARAMS_SIZE) r = 0; @@ -571,7 +569,6 @@ dm_type(const char * name, char * type) { int r = 0; struct dm_task *dmt; - void *next = NULL; uint64_t start, length; char *target_type = NULL; char *params; @@ -588,8 +585,8 @@ dm_type(const char * name, char * type) goto out; /* Fetch 1st target */ - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, ¶ms); + dm_get_next_target(dmt, NULL, &start, &length, + &target_type, ¶ms); if (!target_type) r = -1;