From patchwork Wed Apr 20 10:18:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92172 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 107B0B6FD8 for ; Wed, 20 Apr 2011 20:22:20 +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 1QCUUB-0008Ff-1E; Wed, 20 Apr 2011 10:18:15 +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 1QCUU9-0006KL-HE; Wed, 20 Apr 2011 10:18:13 +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-000660-6V 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 p3KAFnfJ009522 for ; Wed, 20 Apr 2011 13:15:52 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS6009198 ; Wed, 20 Apr 2011 13:15:35 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 13/35] fs-tests: integck: use unsigned int everywhere Date: Wed, 20 Apr 2011 13:18:46 +0300 Message-Id: <1303294748-5492-14-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_128596_7F76B2B5 X-CRM114-Status: GOOD ( 11.76 ) 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 The test sometimes uses "unsigned" and sometimes "unsigned int". This patch makes the code more consistent by making it use "unsigned int" everywhere. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 44 +++++++++++++++++------------------ 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 9eddc0b..3b28e99 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -167,7 +167,7 @@ struct dir_info /* Each directory has one of these */ char *name; struct dir_info *parent; /* Parent directory or null for our top directory */ - unsigned number_of_entries; + unsigned int number_of_entries; struct dir_entry_info *first; struct dir_entry_info *entry; /* Dir entry of this dir */ }; @@ -667,7 +667,7 @@ static void file_info_display(struct file_info *file) { struct dir_entry_info *entry; struct write_info *w; - unsigned wcnt; + unsigned int wcnt; normsg("File Info:"); normsg(" Original name: %s", file->name); @@ -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)file->length); + normsg(" Length: %u", (unsigned int)file->length); normsg(" File was open: %s", (file->fds == NULL) ? "false" : "true"); normsg(" File was deleted: %s", @@ -691,8 +691,9 @@ static void file_info_display(struct file_info *file) w = file->writes; while (w) { normsg(" Offset: %u Size: %u Seed: %u R.Off: %u", - (unsigned)w->offset, (unsigned)w->size, - (unsigned)w->random_seed, (unsigned)w->random_offset); + (unsigned int)w->offset, (unsigned int)w->size, + (unsigned int)w->random_seed, + (unsigned int)w->random_offset); wcnt += 1; w = w->next; } @@ -704,11 +705,11 @@ static void file_info_display(struct file_info *file) while (w) { if (is_truncation(w)) normsg(" Trunc from %u to %u", - (unsigned)w->offset, (unsigned)w->new_length); + (unsigned int)w->offset, (unsigned int)w->new_length); else normsg(" Offset: %u Size: %u Seed: %u R.Off: %u", - (unsigned)w->offset, (unsigned)w->size, - (unsigned)w->random_seed, (unsigned)w->random_offset); + (unsigned int)w->offset, (unsigned int)w->size, + (unsigned int)w->random_seed, (unsigned int)w->random_offset); wcnt += 1; w = w->next; } @@ -735,8 +736,8 @@ static struct fd_info *file_open(struct file_info *file) * gererator with 'seed'. Return amount of written data on success and -1 on * failure. */ -static ssize_t file_write_data(struct file_info *file, int fd, - off_t offset, size_t size, unsigned seed) +static ssize_t file_write_data(struct file_info *file, int fd, off_t offset, + size_t size, unsigned int seed) { size_t remains, actual, block; ssize_t written; @@ -779,10 +780,8 @@ static ssize_t file_write_data(struct file_info *file, int fd, return actual; } -static void file_write_info(struct file_info *file, - off_t offset, - size_t size, - unsigned seed) +static void file_write_info(struct file_info *file, off_t offset, size_t size, + unsigned int seed) { struct write_info *new_write, *w, **prev, *tmp; int inserted; @@ -1016,7 +1015,7 @@ static int file_write(struct file_info *file, int fd) off_t offset; size_t size; ssize_t actual; - unsigned seed; + unsigned int seed; int ret, truncate = 0; if (fsinfo.can_mmap && !full && !file->deleted && @@ -1260,8 +1259,8 @@ static void file_check_hole(struct file_info *file, int fd, off_t offset, if (buf[i] != 0) { errmsg("file_check_hole failed at %u checking " "hole at %u size %u", - (unsigned)(size - remains + i), - (unsigned)offset, (unsigned)size); + (unsigned int)(size - remains + i), + (unsigned int)offset, (unsigned int)size); file_info_display(file); save_file(fd, file); } @@ -1294,8 +1293,8 @@ static void file_check_data(struct file_info *file, int fd, if (buf[i] != c) { errmsg("file_check_data failed at %u checking " "data at %u size %u", - (unsigned)(w->size - remains + i), - (unsigned)w->offset, (unsigned)w->size); + (unsigned int)(w->size - remains + i), + (unsigned int)w->offset, (unsigned int)w->size); file_info_display(file); save_file(fd, file); } @@ -1333,7 +1332,7 @@ static void file_check(struct file_info *file, int fd) pos = lseek(fd, 0, SEEK_END); if (pos != file->length) { errmsg("file_check failed checking length expected %u actual %u\n", - (unsigned)file->length, (unsigned)pos); + (unsigned int)file->length, (unsigned int)pos); file_info_display(file); save_file(fd, file); } @@ -1443,12 +1442,11 @@ static int sort_comp(const void *pa, const void *pb) static void dir_check(struct dir_info *dir) { - struct dir_entry_info **entry_array, **p; + struct dir_entry_info *entry, **entry_array, **p; size_t sz, n; - struct dir_entry_info *entry; DIR *d; struct dirent *ent; - unsigned checked = 0; + unsigned int checked = 0; char *path; int link_count = 2; /* Parent and dot */ struct stat st;