diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-05-07 16:56:40 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-07 16:56:40 +0000 |
| commit | e919b5d5b929faf2af96ce0b36d8bc5b55236153 (patch) | |
| tree | 85612a9614e2e98cdac5605a4a5e8c519270cc61 | |
| parent | 9697b37d50194c839d930e8532ba9692278f81d4 (diff) | |
| download | rockbox-e919b5d5b929faf2af96ce0b36d8bc5b55236153.zip rockbox-e919b5d5b929faf2af96ce0b36d8bc5b55236153.tar.gz rockbox-e919b5d5b929faf2af96ce0b36d8bc5b55236153.tar.bz2 rockbox-e919b5d5b929faf2af96ce0b36d8bc5b55236153.tar.xz | |
Fix disastrous variable shadowing, change casts to unsigned in (cygwin doesn't like mode_t there, and unsigned int should be equally correct) and check the correct bitmask in sim_open().
Should repair filesystem accesses on the sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25881 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/codecs.c | 2 | ||||
| -rw-r--r-- | apps/plugin.c | 3 | ||||
| -rw-r--r-- | apps/plugins/doom/rockdoom.c | 2 | ||||
| -rw-r--r-- | uisimulator/common/io.c | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 4d97baa..46d9223 100644 --- a/apps/codecs.c +++ b/apps/codecs.c @@ -83,7 +83,7 @@ static int open(const char* pathname, int flags, ...) { va_list ap; va_start(ap, flags); - fd = sim_open(pathname, flags, va_arg(ap, mode_t)); + fd = sim_open(pathname, flags, va_arg(ap, unsigned int)); va_end(ap); } else diff --git a/apps/plugin.c b/apps/plugin.c index 8a32a15..e4480de 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -987,8 +987,7 @@ static int open_wrapper(const char* pathname, int flags, ...) { va_list ap; va_start(ap, flags); - int fd; - fd = sim_open(pathname, flags, va_arg(ap, mode_t)); + fd = sim_open(pathname, flags, va_arg(ap, unsigned int)); va_end(ap); } else diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 1383a2b..26afdd9 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c @@ -72,7 +72,7 @@ int my_open(const char *file, int flags, ...) { va_list ap; va_start(ap, flags); - filearray[fpoint]=rb->open(file, flags, va_arg(ap, mode_t)); + filearray[fpoint]=rb->open(file, flags, va_arg(ap, unsigned int)); va_end(ap); } else diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c index 937c710..cddb19c 100644 --- a/uisimulator/common/io.c +++ b/uisimulator/common/io.c @@ -340,11 +340,12 @@ int sim_open(const char *name, int o, ...) if (num_openfiles >= MAX_OPEN_FILES) return -2; - if (o & O_CREAT) + if (opts & O_CREAT) { va_list ap; va_start(ap, o); - ret = OPEN(get_sim_pathname(name), opts, va_arg(ap, mode_t)); + mode_t mode = va_arg(ap, unsigned int); + ret = OPEN(get_sim_pathname(name), opts, mode); va_end(ap); } else |