diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-12-08 21:58:38 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-12-08 21:58:38 +0000 |
commit | ae960a9ece0552d1982e56e26cc4c3932f51f2ab (patch) | |
tree | cba0485d0dfa7febd5f751e2636c27919eb55551 /firmware | |
parent | 8b813d0b99bcda14d6101ea38cc8ebb498281675 (diff) | |
download | rockbox-ae960a9ece0552d1982e56e26cc4c3932f51f2ab.tar.gz rockbox-ae960a9ece0552d1982e56e26cc4c3932f51f2ab.zip |
my take at fixing the simulator warnings by adding mode_t, size_t, ssize_t
and off_t
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4116 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/common/file.c | 12 | ||||
-rw-r--r-- | firmware/include/file.h | 36 |
2 files changed, 36 insertions, 12 deletions
diff --git a/firmware/common/file.c b/firmware/common/file.c index b4b879f8fb..f81038fa77 100644 --- a/firmware/common/file.c +++ b/firmware/common/file.c | |||
@@ -52,7 +52,7 @@ static struct filedesc openfiles[MAX_OPEN_FILES]; | |||
52 | 52 | ||
53 | static int flush_cache(int fd); | 53 | static int flush_cache(int fd); |
54 | 54 | ||
55 | int creat(const char *pathname, int mode) | 55 | int creat(const char *pathname, mode_t mode) |
56 | { | 56 | { |
57 | (void)mode; | 57 | (void)mode; |
58 | return open(pathname, O_WRONLY|O_CREAT|O_TRUNC); | 58 | return open(pathname, O_WRONLY|O_CREAT|O_TRUNC); |
@@ -307,7 +307,7 @@ int rename(const char* path, const char* newpath) | |||
307 | return 0; | 307 | return 0; |
308 | } | 308 | } |
309 | 309 | ||
310 | int ftruncate(int fd, unsigned int size) | 310 | int ftruncate(int fd, off_t size) |
311 | { | 311 | { |
312 | int rc, sector; | 312 | int rc, sector; |
313 | struct filedesc* file = &openfiles[fd]; | 313 | struct filedesc* file = &openfiles[fd]; |
@@ -513,22 +513,22 @@ static int readwrite(int fd, void* buf, int count, bool write) | |||
513 | return nread; | 513 | return nread; |
514 | } | 514 | } |
515 | 515 | ||
516 | int write(int fd, void* buf, int count) | 516 | ssize_t write(int fd, const void* buf, size_t count) |
517 | { | 517 | { |
518 | if (!openfiles[fd].write) { | 518 | if (!openfiles[fd].write) { |
519 | errno = EACCES; | 519 | errno = EACCES; |
520 | return -1; | 520 | return -1; |
521 | } | 521 | } |
522 | return readwrite(fd, buf, count, true); | 522 | return readwrite(fd, (void *)buf, count, true); |
523 | } | 523 | } |
524 | 524 | ||
525 | int read(int fd, void* buf, int count) | 525 | ssize_t read(int fd, void* buf, size_t count) |
526 | { | 526 | { |
527 | return readwrite(fd, buf, count, false); | 527 | return readwrite(fd, buf, count, false); |
528 | } | 528 | } |
529 | 529 | ||
530 | 530 | ||
531 | int lseek(int fd, int offset, int whence) | 531 | off_t lseek(int fd, off_t offset, int whence) |
532 | { | 532 | { |
533 | int pos; | 533 | int pos; |
534 | int newsector; | 534 | int newsector; |
diff --git a/firmware/include/file.h b/firmware/include/file.h index 2ea74c2f5b..8159a7bc84 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h | |||
@@ -42,8 +42,32 @@ | |||
42 | #define O_TRUNC 0x10 | 42 | #define O_TRUNC 0x10 |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | #if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) | ||
46 | #define __ssize_t_defined | ||
47 | #define _SSIZE_T_ | ||
48 | typedef signed long ssize_t; | ||
49 | #endif | ||
50 | |||
51 | #if !defined(__off_t_defined) && !defined(_OFF_T_) | ||
52 | #define __off_t_defined | ||
53 | #define _OFF_T_ | ||
54 | typedef signed long off_t; | ||
55 | #endif | ||
56 | |||
57 | #if !defined(__mode_t_defined) && !defined(_MODE_T_) | ||
58 | #define __mode_t_defined | ||
59 | #define _MODE_T_ | ||
60 | typedef unsigned int mode_t; | ||
61 | #endif | ||
62 | |||
63 | #ifndef _SIZE_T | ||
64 | #define _SIZE_T | ||
65 | typedef unsigned int size_t; | ||
66 | #endif | ||
67 | |||
68 | |||
45 | #if defined(__MINGW32__) && defined(SIMULATOR) | 69 | #if defined(__MINGW32__) && defined(SIMULATOR) |
46 | extern int open(const char*, int, ...); | 70 | extern int open(const char*, int flags, ...); |
47 | extern int close(int fd); | 71 | extern int close(int fd); |
48 | extern int read(int, void*, unsigned int); | 72 | extern int read(int, void*, unsigned int); |
49 | extern long lseek(int, long, int); | 73 | extern long lseek(int, long, int); |
@@ -57,13 +81,13 @@ extern int remove(const char*); | |||
57 | extern int open(const char* pathname, int flags); | 81 | extern int open(const char* pathname, int flags); |
58 | extern int close(int fd); | 82 | extern int close(int fd); |
59 | extern int fsync(int fd); | 83 | extern int fsync(int fd); |
60 | extern int read(int fd, void* buf, int count); | 84 | extern ssize_t read(int fd, void *buf, size_t count); |
61 | extern int lseek(int fd, int offset, int whence); | 85 | extern off_t lseek(int fildes, off_t offset, int whence); |
62 | extern int creat(const char *pathname, int mode); | 86 | extern int creat(const char *pathname, mode_t mode); |
63 | extern int write(int fd, void* buf, int count); | 87 | extern ssize_t write(int fd, const void *buf, size_t count); |
64 | extern int remove(const char* pathname); | 88 | extern int remove(const char* pathname); |
65 | extern int rename(const char* path, const char* newname); | 89 | extern int rename(const char* path, const char* newname); |
66 | extern int ftruncate(int fd, unsigned int size); | 90 | extern int ftruncate(int fd, off_t length); |
67 | extern int filesize(int fd); | 91 | extern int filesize(int fd); |
68 | #endif /* SIMULATOR */ | 92 | #endif /* SIMULATOR */ |
69 | #endif /* __MINGW32__ */ | 93 | #endif /* __MINGW32__ */ |