From: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date: Fri, 20 Jul 2012 13:21:37 +0000 (+0200)
Subject: FAT: Simplify get_contents
X-Git-Tag: v2012.10-rc1~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0880e5bb0c638aec47c1f9349bbb9a0f48179313;p=oweals%2Fu-boot.git

FAT: Simplify get_contents

One call to get_cluster can be factorized with another, so avoid
duplicating code.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Wolfgang Denk <wd@denx.de>
---

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index fa977b35cb..f7bb1dadff 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -367,21 +367,9 @@ get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 			actsize += bytesperclust;
 		}
 
-		/* actsize >= file size */
-		actsize -= bytesperclust;
-
-		/* get remaining clusters */
-		if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
-			printf("Error reading cluster\n");
-			return -1;
-		}
-
 		/* get remaining bytes */
-		gotsize += (int)actsize;
-		filesize -= actsize;
-		buffer += actsize;
 		actsize = filesize;
-		if (get_cluster(mydata, endclust, buffer, (int)actsize) != 0) {
+		if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
 			printf("Error reading cluster\n");
 			return -1;
 		}