From patchwork Wed Apr 20 10:18:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92176 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 120BBB6FD8 for ; Wed, 20 Apr 2011 20:22:39 +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 1QCUU0-00082K-HE; Wed, 20 Apr 2011 10:18:05 +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 1QCUTz-0006JB-36; Wed, 20 Apr 2011 10:18:03 +0000 Received: from smtp.nokia.com ([147.243.1.47] helo=mgw-sa01.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCURu-00066E-JF for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 10:16:04 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3KAFnfK009522 for ; Wed, 20 Apr 2011 13:15:53 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS7009198 ; Wed, 20 Apr 2011 13:15:35 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 14/35] fs-tests: integck: fix placeholders when printing Date: Wed, 20 Apr 2011 13:18:47 +0300 Message-Id: <1303294748-5492-15-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> References: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110420_061555_393148_EE665A52 X-CRM114-Status: UNSURE ( 8.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.47 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dedekind1[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (dedekind1[at]gmail.com) 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: Adrian Hunter 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 From: Artem Bityutskiy There is a lot of code where %u is used for printing off_t variables, which may be actually 64-bit wide. Fix this by using %llu. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 40 ++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 3b28e99..f2223d4 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -679,7 +679,7 @@ static void file_info_display(struct file_info *file) normsg(" Directory: %s", entry->parent->name); entry = entry->next_link; } - normsg(" Length: %u", (unsigned int)file->length); + normsg(" Length: %llu", (unsigned long long)file->length); normsg(" File was open: %s", (file->fds == NULL) ? "false" : "true"); normsg(" File was deleted: %s", @@ -690,10 +690,10 @@ static void file_info_display(struct file_info *file) wcnt = 0; w = file->writes; while (w) { - normsg(" Offset: %u Size: %u Seed: %u R.Off: %u", - (unsigned int)w->offset, (unsigned int)w->size, - (unsigned int)w->random_seed, - (unsigned int)w->random_offset); + normsg(" Offset: %llu Size: %zu Seed: %llu R.Off: %llu", + (unsigned long long)w->offset, w->size, + (unsigned long long)w->random_seed, + (unsigned long long)w->random_offset); wcnt += 1; w = w->next; } @@ -704,12 +704,14 @@ static void file_info_display(struct file_info *file) w = file->raw_writes; while (w) { if (is_truncation(w)) - normsg(" Trunc from %u to %u", - (unsigned int)w->offset, (unsigned int)w->new_length); + normsg(" Trunc from %llu to %llu", + (unsigned long long)w->offset, + (unsigned long long)w->new_length); else - normsg(" Offset: %u Size: %u Seed: %u R.Off: %u", - (unsigned int)w->offset, (unsigned int)w->size, - (unsigned int)w->random_seed, (unsigned int)w->random_offset); + normsg(" Offset: %llu Size: %zu Seed: %llu R.Off: %llu", + (unsigned long long)w->offset, w->size, + (unsigned long long)w->random_seed, + (unsigned long long)w->random_offset); wcnt += 1; w = w->next; } @@ -1257,10 +1259,9 @@ static void file_check_hole(struct file_info *file, int fd, off_t offset, CHECK(read(fd, buf, block) == block); for (i = 0; i < block; ++i) { if (buf[i] != 0) { - errmsg("file_check_hole failed at %u checking " - "hole at %u size %u", - (unsigned int)(size - remains + i), - (unsigned int)offset, (unsigned int)size); + errmsg("file_check_hole failed at %zu checking " + "hole at %llu size %zu", size - remains + i, + (unsigned long long)offset, size); file_info_display(file); save_file(fd, file); } @@ -1291,10 +1292,9 @@ static void file_check_data(struct file_info *file, int fd, for (i = 0; i < block; ++i) { char c = (char)rand(); if (buf[i] != c) { - errmsg("file_check_data failed at %u checking " - "data at %u size %u", - (unsigned int)(w->size - remains + i), - (unsigned int)w->offset, (unsigned int)w->size); + errmsg("file_check_data failed at %zu checking " + "data at %llu size %zu", w->size - remains + i, + (unsigned long long)w->offset, w->size); file_info_display(file); save_file(fd, file); } @@ -1331,8 +1331,8 @@ static void file_check(struct file_info *file, int fd) /* Check length */ pos = lseek(fd, 0, SEEK_END); if (pos != file->length) { - errmsg("file_check failed checking length expected %u actual %u\n", - (unsigned int)file->length, (unsigned int)pos); + errmsg("file_check failed checking length expected %llu actual %llu\n", + (unsigned long long)file->length, (unsigned long long)pos); file_info_display(file); save_file(fd, file); }