projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up some compilation warnings for VxWorks
[yaffs2.git]
/
yaffs_yaffs1.c
diff --git
a/yaffs_yaffs1.c
b/yaffs_yaffs1.c
index da6a40ff96f26ff8def4e0dfd7f2525966d4c7c5..0cdc8c80c108017ef351b8b51d29fd922b6d3480 100644
(file)
--- a/
yaffs_yaffs1.c
+++ b/
yaffs_yaffs1.c
@@
-22,10
+22,10
@@
int yaffs1_scan(struct yaffs_dev *dev)
{
struct yaffs_ext_tags tags;
int yaffs1_scan(struct yaffs_dev *dev)
{
struct yaffs_ext_tags tags;
-
int
blk;
+
u32
blk;
int result;
int chunk;
int result;
int chunk;
-
int
c;
+
u32
c;
int deleted;
enum yaffs_block_state state;
LIST_HEAD(hard_list);
int deleted;
enum yaffs_block_state state;
LIST_HEAD(hard_list);
@@
-98,6
+98,8
@@
int yaffs1_scan(struct yaffs_dev *dev)
result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
&tags);
result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
&tags);
+ if (result != YAFFS_OK)
+ continue;
/* Let's have a good look at this chunk... */
if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED ||
/* Let's have a good look at this chunk... */
if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED ||
@@
-162,15
+164,15
@@
int yaffs1_scan(struct yaffs_dev *dev)
if (in &&
in->variant_type ==
YAFFS_OBJECT_TYPE_FILE &&
if (in &&
in->variant_type ==
YAFFS_OBJECT_TYPE_FILE &&
- in->variant.file_variant.s
cann
ed_size <
+ in->variant.file_variant.s
tor
ed_size <
endpos) {
endpos) {
- in->variant.file_variant.s
cann
ed_size =
+ in->variant.file_variant.s
tor
ed_size =
endpos;
if (!dev->param.use_header_file_size) {
in->variant.
file_variant.file_size =
in->variant.
endpos;
if (!dev->param.use_header_file_size) {
in->variant.
file_variant.file_size =
in->variant.
- file_variant.s
cann
ed_size;
+ file_variant.s
tor
ed_size;
}
}
}
}
@@
-323,11
+325,9
@@
int yaffs1_scan(struct yaffs_dev *dev)
case YAFFS_OBJECT_TYPE_FILE:
if (dev->param.
use_header_file_size)
case YAFFS_OBJECT_TYPE_FILE:
if (dev->param.
use_header_file_size)
-
in->variant.
in->variant.
- file_variant.file_size
- = oh->file_size;
-
+ file_variant.file_size
+ = yaffs_oh_to_size(dev, oh, 0);
break;
case YAFFS_OBJECT_TYPE_HARDLINK:
in->variant.
break;
case YAFFS_OBJECT_TYPE_HARDLINK:
in->variant.