summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-07-03 19:13:25 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-07-03 19:13:25 +0000
commitb637dbbf21b53bbd095b4389113f636c0db3b023 (patch)
treef44fb3fea85eff4e5404bf11784adc843d61aa06 /cpukit
parent2010-07-02 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-b637dbbf21b53bbd095b4389113f636c0db3b023.tar.bz2
2010-07-03 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/include/rtems/libio.h, libfs/src/defaults/default_read.c, libfs/src/defaults/default_readlink.c, libfs/src/rfs/rtems-rfs-rtems.c: Correct types and prototypes to eliminate warnings.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/libcsupport/include/rtems/libio.h18
-rw-r--r--cpukit/libfs/src/defaults/default_read.c2
-rw-r--r--cpukit/libfs/src/defaults/default_readlink.c2
-rw-r--r--cpukit/libfs/src/rfs/rtems-rfs-rtems.c2
5 files changed, 19 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 4fe12bab8c..550e58dc16 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-03 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * libcsupport/include/rtems/libio.h, libfs/src/defaults/default_read.c,
+ libfs/src/defaults/default_readlink.c,
+ libfs/src/rfs/rtems-rfs-rtems.c: Correct types and prototypes to
+ eliminate warnings.
+
2010-07-01 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libfs/src/dosfs/msdos_handlers_dir.c,
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index 946cce147c..f3f9c2ea38 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -387,7 +387,7 @@ int rtems_filesystem_default_close(
* system call support which is provided by a file system
* implementation.
*/
-size_t rtems_filesystem_default_read(
+ssize_t rtems_filesystem_default_read(
rtems_libio_t *iop,
void *buffer,
size_t count
@@ -659,10 +659,10 @@ typedef int (*rtems_filesystem_symlink_t)(
* This type defines the interface to the readlink(2) system call
* support which is provided by a file system implementation.
*/
-typedef int (*rtems_filesystem_readlink_t)(
+typedef ssize_t (*rtems_filesystem_readlink_t)(
rtems_filesystem_location_info_t *loc, /* IN */
char *buf, /* OUT */
- size_t bufsize
+ size_t bufsize
);
/**
@@ -1012,10 +1012,10 @@ int rtems_filesystem_default_symlink(
* @brief Provides a defualt routine for filesystem
* implementation of a readlink command.
*/
-int rtems_filesystem_default_readlink(
+ssize_t rtems_filesystem_default_readlink(
rtems_filesystem_location_info_t *loc, /* IN */
char *buf, /* OUT */
- size_t bufsize
+ size_t bufsize
);
/**
@@ -1165,16 +1165,16 @@ typedef int (*rtems_libio_close_t)(
int fd
);
-typedef int (*rtems_libio_read_t)(
+typedef ssize_t (*rtems_libio_read_t)(
int fd,
void *buffer,
- uint32_t count
+ size_t count
);
-typedef int (*rtems_libio_write_t)(
+typedef ssize_t (*rtems_libio_write_t)(
int fd,
const void *buffer,
- uint32_t count
+ size_t count
);
typedef int (*rtems_libio_ioctl_t)(
diff --git a/cpukit/libfs/src/defaults/default_read.c b/cpukit/libfs/src/defaults/default_read.c
index 5d2001c4cc..2f6d7e9d72 100644
--- a/cpukit/libfs/src/defaults/default_read.c
+++ b/cpukit/libfs/src/defaults/default_read.c
@@ -13,7 +13,7 @@
#include <rtems/libio_.h>
#include <rtems/seterr.h>
-size_t rtems_filesystem_default_read(
+ssize_t rtems_filesystem_default_read(
rtems_libio_t *iop,
void *buffer,
size_t count
diff --git a/cpukit/libfs/src/defaults/default_readlink.c b/cpukit/libfs/src/defaults/default_readlink.c
index 8befb51093..1d07970999 100644
--- a/cpukit/libfs/src/defaults/default_readlink.c
+++ b/cpukit/libfs/src/defaults/default_readlink.c
@@ -13,7 +13,7 @@
#include <rtems/libio_.h>
#include <rtems/seterr.h>
-int rtems_filesystem_default_readlink(
+ssize_t rtems_filesystem_default_readlink(
rtems_filesystem_location_info_t *loc, /* IN */
char *buf, /* OUT */
size_t bufsize
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
index 845162863e..9c89cc5acd 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
@@ -773,7 +773,7 @@ rtems_rfs_rtems_symlink (rtems_filesystem_location_info_t* parent_loc,
* @return int
*/
-int
+ssize_t
rtems_rfs_rtems_readlink (rtems_filesystem_location_info_t* pathloc,
char* buf,
size_t bufsize)