From patchwork Mon Nov 29 20:08:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 12645639 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5ACC6C433EF for ; Mon, 29 Nov 2021 20:10:27 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-405-eGSW1c6qPqCBFaxaV2qHaw-1; Mon, 29 Nov 2021 15:10:22 -0500 X-MC-Unique: eGSW1c6qPqCBFaxaV2qHaw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 66A0D81CCB5; Mon, 29 Nov 2021 20:10:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 486D65D740; Mon, 29 Nov 2021 20:10:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2214F1809CB8; Mon, 29 Nov 2021 20:10:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ATK9mYh001989 for ; Mon, 29 Nov 2021 15:09:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 650322026D11; Mon, 29 Nov 2021 20:09:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CA552026D6B for ; Mon, 29 Nov 2021 20:09:44 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82F04106655A for ; Mon, 29 Nov 2021 20:09:44 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-23-xapoDOh5NruMEmTG4py-jw-1; Mon, 29 Nov 2021 15:09:40 -0500 X-MC-Unique: xapoDOh5NruMEmTG4py-jw-1 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 323061FD59; Mon, 29 Nov 2021 20:09:39 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id ED6EA13BDA; Mon, 29 Nov 2021 20:09:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wDHbN4IzpWFsHgAAMHmgww (envelope-from ); Mon, 29 Nov 2021 20:09:38 +0000 From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Mon, 29 Nov 2021 21:08:54 +0100 Message-Id: <20211129200902.21817-6-mwilck@suse.com> In-Reply-To: <20211129200902.21817-1-mwilck@suse.com> References: <20211129200902.21817-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1ATK9mYh001989 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH v2 05/13] libmultipath: drop padding code in _snprint_pathgroup() 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: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com From: Martin Wilck We don't use padding for pathgroup fields, field width is always 0. Remove this dead code. Signed-off-by: Martin Wilck --- libmultipath/print.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libmultipath/print.c b/libmultipath/print.c index 1667d3e..48562ce 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -1167,25 +1167,16 @@ int _snprint_pathgroup(const struct gen_pathgroup *ggp, struct strbuf *line, { int initial_len = get_strbuf_len(line); const char *f; - struct pathgroup_data *data; int rc; for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { - int iwc; - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) return rc; format = f + 1; - if ((iwc = pgd_lookup(*format)) == -1) - continue; /* unknown wildcard */ - data = &pgd[iwc]; if ((rc = ggp->ops->snprint(ggp, line, *format)) < 0) return rc; - else if ((unsigned int)rc < data->width) - if ((rc = fill_strbuf(line, ' ', data->width - rc)) < 0) - return rc; } if ((rc = print_strbuf(line, "%s\n", format)) < 0)