brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

yaffs2: preprocessor cleanup

Browse Source 
Current code uses the preprocessor to change an else case
to a statement without any if condition at all. Although
this works, change the optional code to return early, so
all optional code is contained within a single #ifdef.

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
This commit is contained in:
Jeroen Hofstee 2014-07-12 15:16:52 +02:00 committed by Tom Rini
parent e803fa2c4b
commit 862c93e96e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/yaffs2/yaffs_guts.c
View File

@ -3203,19 +3203,18 @@ static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
} else { } else {
yaffs_strncpy(name, oh_name + 1, buff_size - 1); yaffs_strncpy(name, oh_name + 1, buff_size - 1);
} }
} else {
#else return;
{
#endif
yaffs_strncpy(name, oh_name, buff_size - 1);
} }
#endif
yaffs_strncpy(name, oh_name, buff_size - 1);
} }
static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name, static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
const YCHAR *name) const YCHAR *name)
{ {
#ifdef CONFIG_YAFFS_AUTO_UNICODE #ifdef CONFIG_YAFFS_AUTO_UNICODE
int is_ascii; int is_ascii;
YCHAR *w; YCHAR *w;
@ -3246,12 +3245,12 @@ static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
*oh_name = 0; *oh_name = 0;
yaffs_strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); yaffs_strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2);
} }
} else {
#else return;
{
#endif
yaffs_strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
} }
#endif
yaffs_strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
} }
/* UpdateObjectHeader updates the header on NAND for an object. /* UpdateObjectHeader updates the header on NAND for an object.