projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '32-bit-loff_t'
[yaffs2.git]
/
yaffs_guts.c
diff --git
a/yaffs_guts.c
b/yaffs_guts.c
index 6d9f608601f48d0e12fe35a1db630805a08d950d..1602c4bde572e538482953ee10bff65d1624b5d9 100644
(file)
--- a/
yaffs_guts.c
+++ b/
yaffs_guts.c
@@
-194,18
+194,18
@@
static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
const u8 *data,
const struct yaffs_ext_tags *tags)
{
const u8 *data,
const struct yaffs_ext_tags *tags)
{
-
dev =
dev;
-
nand_chunk =
nand_chunk;
-
data =
data;
-
tags =
tags;
+
(void)
dev;
+
(void)
nand_chunk;
+
(void)
data;
+
(void)
tags;
}
static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
const struct yaffs_ext_tags *tags)
{
}
static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
const struct yaffs_ext_tags *tags)
{
-
dev =
dev;
-
nand_chunk =
nand_chunk;
-
tags =
tags;
+
(void)
dev;
+
(void)
nand_chunk;
+
(void)
tags;
}
void yaffs_handle_chunk_error(struct yaffs_dev *dev,
}
void yaffs_handle_chunk_error(struct yaffs_dev *dev,
@@
-675,7
+675,10
@@
void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
loff_t yaffs_max_file_size(struct yaffs_dev *dev)
{
loff_t yaffs_max_file_size(struct yaffs_dev *dev)
{
- return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
+ if(sizeof(loff_t) < 8)
+ return YAFFS_MAX_FILE_SIZE_32;
+ else
+ return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
}
/*-------------------- TNODES -------------------
}
/*-------------------- TNODES -------------------
@@
-791,7
+794,7
@@
struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
int required_depth;
int level = file_struct->top_level;
int required_depth;
int level = file_struct->top_level;
-
dev =
dev;
+
(void)
dev;
/* Check sane level and chunk Id */
if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
/* Check sane level and chunk Id */
if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
@@
-3198,7
+3201,7
@@
static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
}
} else {
#else
}
} else {
#else
-
dev =
dev;
+
(void)
dev;
{
#endif
strncpy(name, oh_name, buff_size - 1);
{
#endif
strncpy(name, oh_name, buff_size - 1);
@@
-4983,8
+4986,8
@@
int yaffs_get_n_free_chunks(struct yaffs_dev *dev)
return n_free;
}
return n_free;
}
-/*
\
- * Marshalling functions to get loff_t file sizes into a
a
nd out of
+/*
+ * Marshalling functions to get loff_t file sizes into and out of
* object headers.
*/
void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize)
* object headers.
*/
void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize)
@@
-4997,7
+5000,7
@@
loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh)
{
loff_t retval;
{
loff_t retval;
- if (~(oh->file_size_high))
+ if (
sizeof(loff_t) >= 8 &&
~(oh->file_size_high))
retval = (((loff_t) oh->file_size_high) << 32) |
(((loff_t) oh->file_size_low) & 0xFFFFFFFF);
else
retval = (((loff_t) oh->file_size_high) << 32) |
(((loff_t) oh->file_size_low) & 0xFFFFFFFF);
else