diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-08-13 00:32:32 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-08-13 00:32:32 +0000 |
commit | 3169482b6c251e6c532b96c7af5ce2b181660706 (patch) | |
tree | 64ce64ae4b8c16dc5a3428e16bf51a1c1d6f58cf | |
parent | b796f476c1dc59a2f063181b65648993b3e1a858 (diff) | |
download | px4-nuttx-3169482b6c251e6c532b96c7af5ce2b181660706.tar.gz px4-nuttx-3169482b6c251e6c532b96c7af5ce2b181660706.tar.bz2 px4-nuttx-3169482b6c251e6c532b96c7af5ce2b181660706.zip |
Fix read()/write() prototype
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@820 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/ChangeLog | 2 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 2 | ||||
-rw-r--r-- | nuttx/Documentation/NuttxUserGuide.html | 16 | ||||
-rw-r--r-- | nuttx/fs/fs_read.c | 2 | ||||
-rw-r--r-- | nuttx/fs/fs_write.c | 4 | ||||
-rw-r--r-- | nuttx/include/unistd.h | 28 |
6 files changed, 29 insertions, 25 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 98ecf7778..6378c34ce 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -402,4 +402,6 @@ * Removed duplicate getenv() implementation in /lib * Correct detection of End-of-File in fgets * Implement sh and crude script handler in NSH + * Fix prototype of read() and write(). Need to use ssize_t and size_t, not + int and unsigned int. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 6356422c5..72b61cb91 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1036,6 +1036,8 @@ nuttx-0.3.13 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * Removed duplicate getenv() implementation in /lib * Correct detection of End-of-File in fgets * Implement sh and crude script handler in NSH + * Fix prototype of read() and write(). Need to use ssize_t and size_t, not + int and unsigned int. pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/Documentation/NuttxUserGuide.html b/nuttx/Documentation/NuttxUserGuide.html index a6e6ea90d..e5cb13eb3 100644 --- a/nuttx/Documentation/NuttxUserGuide.html +++ b/nuttx/Documentation/NuttxUserGuide.html @@ -5917,18 +5917,18 @@ interface of the same name. <ul><pre> #include <unistd.h> - int close(int fd); - int dup(int fildes); - int dup2(int fildes1, int fildes2); - off_t lseek(int fd, off_t offset, int whence); - int read(int fd, void *buf, unsigned int nbytes); - int unlink(const char *path); - int write(int fd, const void *buf, unsigned int nbytes); + int close(int fd); + int dup(int fildes); + int dup2(int fildes1, int fildes2); + off_t lseek(int fd, off_t offset, int whence); + ssize_t read(int fd, void *buf, size_t nbytes); + int unlink(const char *path); + ssize_t write(int fd, const void *buf, size_t nbytes); </pre></ul> <ul><pre> #include <sys/ioctl.h> - int ioctl(int fd, int req, unsigned long arg); + int ioctl(int fd, int req, unsigned long arg); </pre></ul> <h2><a name="directoryoperations">2.11.3 Directory Operations</a></h2> diff --git a/nuttx/fs/fs_read.c b/nuttx/fs/fs_read.c index 7500d3599..51d10830a 100644 --- a/nuttx/fs/fs_read.c +++ b/nuttx/fs/fs_read.c @@ -53,7 +53,7 @@ * Global Functions ****************************************************************************/ -int read(int fd, FAR void *buf, unsigned int nbytes) +ssize_t read(int fd, FAR void *buf, size_t nbytes) { FAR struct filelist *list; int ret = EBADF; diff --git a/nuttx/fs/fs_write.c b/nuttx/fs/fs_write.c index 28fa8664c..19652ad59 100644 --- a/nuttx/fs/fs_write.c +++ b/nuttx/fs/fs_write.c @@ -58,7 +58,7 @@ * Global Functions ****************************************************************************/ -/******************************************************************************************** +/*************************************************************************** * Function: write * * Description: @@ -108,7 +108,7 @@ * ********************************************************************************************/ -int write(int fd, FAR const void *buf, unsigned int nbytes) +ssize_t write(int fd, FAR const void *buf, size_t nbytes) { #if CONFIG_NFILE_DESCRIPTORS > 0 FAR struct filelist *list; diff --git a/nuttx/include/unistd.h b/nuttx/include/unistd.h index e2b88686f..ae34e3d6a 100644 --- a/nuttx/include/unistd.h +++ b/nuttx/include/unistd.h @@ -120,32 +120,32 @@ EXTERN int optopt; /* unrecognized option character */ /* Task Control Interfaces */ -EXTERN pid_t getpid(void); -EXTERN void _exit(int status) noreturn_function; +EXTERN pid_t getpid(void); +EXTERN void _exit(int status) noreturn_function; EXTERN unsigned int sleep(unsigned int seconds); -EXTERN void usleep(unsigned long usec); +EXTERN void usleep(unsigned long usec); /* File descriptor operations */ -EXTERN int close(int fd); -EXTERN int dup(int fd); -EXTERN int dup2(int fd1, int fd2); -EXTERN int fsync(int fd); -EXTERN off_t lseek(int fd, off_t offset, int whence); -EXTERN int read(int fd, FAR void *buf, unsigned int nbytes); -EXTERN int write(int fd, FAR const void *buf, unsigned int nbytes); +EXTERN int close(int fd); +EXTERN int dup(int fd); +EXTERN int dup2(int fd1, int fd2); +EXTERN int fsync(int fd); +EXTERN off_t lseek(int fd, off_t offset, int whence); +EXTERN ssize_t read(int fd, FAR void *buf, size_t nbytes); +EXTERN ssize_t write(int fd, FAR const void *buf, size_t nbytes); /* Special devices */ -EXTERN int pipe(int filedes[2]); +EXTERN int pipe(int filedes[2]); /* File path operations */ -EXTERN int unlink(FAR const char *pathname); -EXTERN int rmdir(FAR const char *pathname); +EXTERN int unlink(FAR const char *pathname); +EXTERN int rmdir(FAR const char *pathname); /* Other */ -EXTERN int getopt(int argc, FAR char *const argv[], FAR const char *optstring); +EXTERN int getopt(int argc, FAR char *const argv[], FAR const char *optstring); #undef EXTERN #if defined(__cplusplus) |