From patchwork Wed Apr 20 09:35:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shevchenko Andriy (EXT-Teleca/Helsinki)" X-Patchwork-Id: 92120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3690FB701F for ; Wed, 20 Apr 2011 19:36:53 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCToE-0004So-Ff; Wed, 20 Apr 2011 09:34:54 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1QCToC-0005l1-Md; Wed, 20 Apr 2011 09:34:52 +0000 Received: from smtp.nokia.com ([147.243.1.48] helo=mgw-sa02.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCTo9-0005kZ-3a for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 09:34:50 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3K9YjLe031400; Wed, 20 Apr 2011 12:34:46 +0300 Received: from fs-test.research.nokia.com ([esdhcp05135.research.nokia.com [172.21.51.35]]) by mgw-sa02.nokia.com with ESMTP id p3K9YhMs031376 ; Wed, 20 Apr 2011 12:34:44 +0300 Received: by fs-test.research.nokia.com (Postfix, from userid 1001) id 86002CF9FC; Wed, 20 Apr 2011 12:35:11 +0300 (EEST) From: Andy Shevchenko To: Mike Frysinger , Artem Bityutskiy , linux-mtd@lists.infradead.org Subject: [PATCHv4 2/3] libmtd: use PRIu64 classifier for uint64_t printf arguments Date: Wed, 20 Apr 2011 12:35:09 +0300 Message-Id: <0bd629717df8aefb5b2eca07fcf6c1abe8c67c70.1303292025.git.ext-andriy.shevchenko@nokia.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <54dce27649702199efe5afb3d14e8f3f6103da00.1303292025.git.ext-andriy.shevchenko@nokia.com> In-Reply-To: <54dce27649702199efe5afb3d14e8f3f6103da00.1303292025.git.ext-andriy.shevchenko@nokia.com> References: <54dce27649702199efe5afb3d14e8f3f6103da00.1303292025.git.ext-andriy.shevchenko@nokia.com> References: <54dce27649702199efe5afb3d14e8f3f6103da00.1303292025.git.ext-andriy.shevchenko@nokia.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110420_053449_427499_48189CAF X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 TVD_RCVD_SPACE_BRACKET TVD_RCVD_SPACE_BRACKET -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.48 listed in list.dnswl.org] Cc: Andy Shevchenko 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 Signed-off-by: Andy Shevchenko --- lib/libmtd.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/lib/libmtd.c b/lib/libmtd.c index 418ba29..7fabd80 100644 --- a/lib/libmtd.c +++ b/lib/libmtd.c @@ -31,9 +31,11 @@ #include #include #include -#include +#include +#include #include + #include "libmtd_int.h" #include "common.h" @@ -1096,19 +1098,16 @@ int do_oob_op(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, max_offs = (unsigned long long)mtd->eb_cnt * mtd->eb_size; if (start >= max_offs) { - errmsg("bad page address %llu, mtd%d has %d eraseblocks " - "(%llu bytes)", (unsigned long long) start, mtd->mtd_num, - mtd->eb_cnt, max_offs); + errmsg("bad page address %" PRIu64 ", mtd%d has %d eraseblocks (%llu bytes)", + start, mtd->mtd_num, mtd->eb_cnt, max_offs); errno = EINVAL; return -1; } oob_offs = start & (mtd->min_io_size - 1); if (oob_offs + length > mtd->oob_size || length == 0) { - errmsg("Cannot write %llu OOB bytes to address %llu " - "(OOB offset %u) - mtd%d OOB size is only %d bytes", - (unsigned long long)length, (unsigned long long)start, - oob_offs, mtd->mtd_num, mtd->oob_size); + errmsg("Cannot write %" PRIu64 " OOB bytes to address %" PRIu64 " (OOB offset %u) - mtd%d OOB size is only %d bytes", + length, start, oob_offs, mtd->mtd_num, mtd->oob_size); errno = EINVAL; return -1; } @@ -1125,10 +1124,8 @@ int do_oob_op(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, if (errno != ENOTTY || lib->offs64_ioctls != OFFS64_IOCTLS_UNKNOWN) { - sys_errmsg("%s ioctl failed for mtd%d, offset %llu " - "(eraseblock %llu)", cmd64_str, mtd->mtd_num, - (unsigned long long)start, - (unsigned long long)start / mtd->eb_size); + sys_errmsg("%s ioctl failed for mtd%d, offset %" PRIu64 " (eraseblock %" PRIu64 ")", + cmd64_str, mtd->mtd_num, start, start / mtd->eb_size); } /* @@ -1152,10 +1149,8 @@ int do_oob_op(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, ret = ioctl(fd, cmd, &oob); if (ret < 0) - sys_errmsg("%s ioctl failed for mtd%d, offset %llu " - "(eraseblock %llu)", cmd_str, mtd->mtd_num, - (unsigned long long)start, - (unsigned long long)start / mtd->eb_size); + sys_errmsg("%s ioctl failed for mtd%d, offset %" PRIu64 " (eraseblock %" PRIu64 ")", + cmd_str, mtd->mtd_num, start, start / mtd->eb_size); return ret; }