From patchwork Fri Aug 19 17:07:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 110702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FA53B6F77 for ; Sat, 20 Aug 2011 03:10:20 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZr-0001lj-Oq; Fri, 19 Aug 2011 17:09:52 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZp-0003vA-NR; Fri, 19 Aug 2011 17:09:49 +0000 Received: from mail-yi0-f49.google.com ([209.85.218.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZE-0003dD-IS for linux-mtd@lists.infradead.org; Fri, 19 Aug 2011 17:09:14 +0000 Received: by mail-yi0-f49.google.com with SMTP id 13so2669541yic.36 for ; Fri, 19 Aug 2011 10:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fv2F8RtwRH4SZgQwaKQs7iexIdwmgQ6i7Mwd+OguP9g=; b=x50ICaoX+8MWEIxvr3MStg8iYRb5fLP8y2AgEy1aRa7PJMVSFiIimnAIO721OS363t uE3Gn6HVpfEr/LlOted2cIAnt/qFmq+Hx9erQFnqb7qdvpsOiiqPv7QTW5jq98LHM+pl SZmnPO9qqYmkQcIlXV+NnZnU1W4Q5K5QJCPyc= Received: by 10.142.143.11 with SMTP id q11mr1171844wfd.329.1313773751711; Fri, 19 Aug 2011 10:09:11 -0700 (PDT) Received: from localhost.localdomain (cpe-76-174-190-12.socal.res.rr.com [76.174.190.12]) by mx.google.com with ESMTPS id f8sm2467499pbk.22.2011.08.19.10.09.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Aug 2011 10:09:10 -0700 (PDT) From: Brian Norris To: Artem Bityutskiy Subject: [PATCH 09/10] nandwrite: refactor "old_oobinfo" code Date: Fri, 19 Aug 2011 10:07:55 -0700 Message-Id: <1313773676-12879-10-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313773676-12879-1-git-send-email-computersforpeace@gmail.com> References: <1313773676-12879-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110819_130912_908312_8AA63039 X-CRM114-Status: GOOD ( 12.47 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.218.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kevin Cernekee , Brian Norris , linux-mtd@lists.infradead.org, Mike Frysinger X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Move variable within conditional and remove duplicated code. Signed-off-by: Brian Norris --- nandwrite.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nandwrite.c b/nandwrite.c index 078e2ff..e782aeb 100644 --- a/nandwrite.c +++ b/nandwrite.c @@ -497,7 +497,6 @@ int main(int argc, char * const argv[]) if (!noecc) { int i, start, len; - int tags_pos = 0; struct nand_oobinfo old_oobinfo; /* Read the current oob info */ @@ -515,16 +514,13 @@ int main(int argc, char * const argv[]) * such as the layout used by diskonchip.c */ if (old_oobinfo.useecc == MTD_NANDECC_AUTOPLACE) { + int tags_pos = 0, tmp_ofs; for (i = 0; old_oobinfo.oobfree[i][1]; i++) { /* Set the reserved bytes to 0xff */ start = old_oobinfo.oobfree[i][0]; len = old_oobinfo.oobfree[i][1]; - if (rawoob) - memcpy(oobbuf + start, - oobreadbuf + start, len); - else - memcpy(oobbuf + start, - oobreadbuf + tags_pos, len); + tmp_ofs = rawoob ? start : tags_pos; + memcpy(oobbuf + start, oobreadbuf + tmp_ofs, len); tags_pos += len; } } else {