projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'block-summary'
[yaffs2.git]
/
yaffs_guts.c
diff --git
a/yaffs_guts.c
b/yaffs_guts.c
index dfabf4c29d23ea75e1b0e9bfb4d0b6a5e7360ab4..d72aa5ba9e5a59c1c3722664fccd881b7694d3c1 100644
(file)
--- a/
yaffs_guts.c
+++ b/
yaffs_guts.c
@@
-672,7
+672,6
@@
static u16 yaffs_calc_name_sum(const YCHAR *name)
void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
{
void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
{
-#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
memset(obj->short_name, 0, sizeof(obj->short_name));
if (name &&
strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
memset(obj->short_name, 0, sizeof(obj->short_name));
if (name &&
strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
@@
-680,7
+679,6
@@
void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
strcpy(obj->short_name, name);
else
obj->short_name[0] = _Y('\0');
strcpy(obj->short_name, name);
else
obj->short_name[0] = _Y('\0');
-#endif
obj->sum = yaffs_calc_name_sum(name);
}
obj->sum = yaffs_calc_name_sum(name);
}
@@
-4418,13
+4416,11
@@
int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
{
memset(name, 0, buffer_size * sizeof(YCHAR));
yaffs_check_obj_details_loaded(obj);
{
memset(name, 0, buffer_size * sizeof(YCHAR));
yaffs_check_obj_details_loaded(obj);
- if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND)
+ if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND)
{
strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
-#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
- else if (obj->short_name[0])
+ } else if (obj->short_name[0]) {
strcpy(name, obj->short_name);
strcpy(name, obj->short_name);
-#endif
- else if (obj->hdr_chunk > 0) {
+ } else if (obj->hdr_chunk > 0) {
int result;
u8 *buffer = yaffs_get_temp_buffer(obj->my_dev);
int result;
u8 *buffer = yaffs_get_temp_buffer(obj->my_dev);
@@
-4538,8
+4534,6
@@
static int yaffs_check_dev_fns(const struct yaffs_dev *dev)
if (!dev->param.erase_fn || !dev->param.initialise_flash_fn)
return 0;
if (!dev->param.erase_fn || !dev->param.initialise_flash_fn)
return 0;
-#ifdef CONFIG_YAFFS_YAFFS2
-
/* Can use the "with tags" style interface for yaffs1 or yaffs2 */
if (dev->param.write_chunk_tags_fn &&
dev->param.read_chunk_tags_fn &&
/* Can use the "with tags" style interface for yaffs1 or yaffs2 */
if (dev->param.write_chunk_tags_fn &&
dev->param.read_chunk_tags_fn &&
@@
-4547,7
+4541,6
@@
static int yaffs_check_dev_fns(const struct yaffs_dev *dev)
!dev->param.read_chunk_fn &&
dev->param.bad_block_fn && dev->param.query_block_fn)
return 1;
!dev->param.read_chunk_fn &&
dev->param.bad_block_fn && dev->param.query_block_fn)
return 1;
-#endif
/* Can use the "spare" style interface for yaffs1 */
if (!dev->param.is_yaffs2 &&
/* Can use the "spare" style interface for yaffs1 */
if (!dev->param.is_yaffs2 &&