diff options
| author | Timothy Manning <tfhmanning@gmail.com> | 2011-01-11 12:23:05 +1300 |
|---|---|---|
| committer | Timothy Manning <tfhmanning@gmail.com> | 2011-01-11 12:23:05 +1300 |
| commit | 6820610d6b3ea887af57fbd9706fff78923a2115 (patch) | |
| tree | 6372ef8989d39a6ea50629866631dffea407d1eb /direct | |
| parent | c708692e40afc63484b8bb0ae4ec30f56329264b (diff) | |
| parent | fca6bc56719f4e381fc2dfd96b3f3902567837cc (diff) | |
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
Diffstat (limited to 'direct')
| -rw-r--r-- | direct/yaffsfs.c | 8 | ||||
| -rw-r--r-- | direct/ydirectenv.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index e3bc19d..e4f6df0 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -650,13 +650,11 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, /* got to the end of the string */ return dir; else{ - if(strcmp(str,_Y(".")) == 0) - { + if(strcmp(str,_Y(".")) == 0){ /* Do nothing */ - } - else if(strcmp(str,_Y("..")) == 0) + } else if(strcmp(str,_Y("..")) == 0) { dir = dir->parent; - else{ + } else{ dir = yaffs_find_by_name(dir,str); dir = yaffsfs_FollowLink(dir,symDepth,loop); diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h index 63cd6d8..7063fa6 100644 --- a/direct/ydirectenv.h +++ b/direct/ydirectenv.h @@ -61,7 +61,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es, #define cond_resched() do {} while(0) #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printf("yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0) |