From 7192476f7a9640986f9338f6ece9f0eec6ee8766 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 8 Dec 2006 07:18:27 +0000 Subject: Use size_t instead of uint32_t for read/write count-args. --- cpukit/libcsupport/include/rtems/libio.h | 4 ++-- cpukit/libcsupport/src/read.c | 4 ++-- cpukit/libfs/src/dosfs/msdos.h | 6 +++--- cpukit/libfs/src/dosfs/msdos_dir.c | 2 +- cpukit/libfs/src/dosfs/msdos_file.c | 4 ++-- cpukit/libfs/src/imfs/deviceio.c | 4 ++-- cpukit/libfs/src/imfs/imfs.h | 10 +++++----- cpukit/libfs/src/imfs/imfs_directory.c | 4 ++-- cpukit/libfs/src/imfs/memfile.c | 4 ++-- cpukit/libnetworking/lib/ftpfs.c | 4 ++-- cpukit/libnetworking/lib/tftpDriver.c | 4 ++-- cpukit/libnetworking/rtems/rtems_syscall.c | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 4b5e000bea..cf0441cbac 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -67,13 +67,13 @@ typedef int (*rtems_filesystem_close_t)( typedef ssize_t (*rtems_filesystem_read_t)( rtems_libio_t *iop, void *buffer, - uint32_t count + size_t count ); typedef ssize_t (*rtems_filesystem_write_t)( rtems_libio_t *iop, const void *buffer, - uint32_t count + size_t count ); typedef int (*rtems_filesystem_ioctl_t)( diff --git a/cpukit/libcsupport/src/read.c b/cpukit/libcsupport/src/read.c index a57426666c..46f731e479 100644 --- a/cpukit/libcsupport/src/read.c +++ b/cpukit/libcsupport/src/read.c @@ -24,7 +24,7 @@ ssize_t read( size_t count ) { - int rc; /* XXX change to a size_t when prototype is fixed */ + ssize_t rc; rtems_libio_t *iop; rtems_libio_check_fd( fd ); @@ -59,7 +59,7 @@ ssize_t read( #include -_ssize_t _read_r( +ssize_t _read_r( struct _reent *ptr, int fd, void *buf, diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h index b4ea6abe40..2fec769446 100644 --- a/cpukit/libfs/src/dosfs/msdos.h +++ b/cpukit/libfs/src/dosfs/msdos.h @@ -249,13 +249,13 @@ int msdos_file_close(rtems_libio_t *iop /* IN */); ssize_t msdos_file_read( rtems_libio_t *iop, /* IN */ void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); ssize_t msdos_file_write( rtems_libio_t *iop, /* IN */ const void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); int msdos_file_lseek( @@ -305,7 +305,7 @@ int msdos_dir_close(rtems_libio_t *iop /* IN */); ssize_t msdos_dir_read( rtems_libio_t *iop, /* IN */ void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); int msdos_dir_lseek( diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c index 38699a73a7..b73f278917 100644 --- a/cpukit/libfs/src/dosfs/msdos_dir.c +++ b/cpukit/libfs/src/dosfs/msdos_dir.c @@ -196,7 +196,7 @@ msdos_format_dirent_with_dot(char *dst,const char *src) * set apropriately). */ ssize_t -msdos_dir_read(rtems_libio_t *iop, void *buffer, uint32_t count) +msdos_dir_read(rtems_libio_t *iop, void *buffer, size_t count) { int rc = RC_OK; rtems_status_code sc = RTEMS_SUCCESSFUL; diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c index 14bd96b325..35641e1687 100644 --- a/cpukit/libfs/src/dosfs/msdos_file.c +++ b/cpukit/libfs/src/dosfs/msdos_file.c @@ -144,7 +144,7 @@ msdos_file_close(rtems_libio_t *iop) * appropriately) */ ssize_t -msdos_file_read(rtems_libio_t *iop, void *buffer, uint32_t count) +msdos_file_read(rtems_libio_t *iop, void *buffer, size_t count) { ssize_t ret = 0; rtems_status_code sc = RTEMS_SUCCESSFUL; @@ -177,7 +177,7 @@ msdos_file_read(rtems_libio_t *iop, void *buffer, uint32_t count) * and errno set appropriately */ ssize_t -msdos_file_write(rtems_libio_t *iop,const void *buffer, uint32_t count) +msdos_file_write(rtems_libio_t *iop,const void *buffer, size_t count) { ssize_t ret = 0; rtems_status_code sc = RTEMS_SUCCESSFUL; diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c index c0758396e3..8c44e0a223 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -130,7 +130,7 @@ int device_close( ssize_t device_read( rtems_libio_t *iop, void *buffer, - uint32_t count + size_t count ) { rtems_libio_rw_args_t args; @@ -167,7 +167,7 @@ ssize_t device_read( ssize_t device_write( rtems_libio_t *iop, const void *buffer, - uint32_t count + size_t count ) { rtems_libio_rw_args_t args; diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h index a5e82a1579..a8fafd83ec 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/libfs/src/imfs/imfs.h @@ -403,7 +403,7 @@ int imfs_dir_close( ssize_t imfs_dir_read( rtems_libio_t *iop, /* IN */ void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); int imfs_dir_lseek( @@ -435,13 +435,13 @@ int memfile_close( ssize_t memfile_read( rtems_libio_t *iop, /* IN */ void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); ssize_t memfile_write( rtems_libio_t *iop, /* IN */ const void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); int memfile_ioctl( @@ -474,13 +474,13 @@ int device_close( ssize_t device_read( rtems_libio_t *iop, /* IN */ void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); ssize_t device_write( rtems_libio_t *iop, /* IN */ const void *buffer, /* IN */ - uint32_t count /* IN */ + size_t count /* IN */ ); int device_ioctl( diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c index b5ce125321..6f7c889d59 100644 --- a/cpukit/libfs/src/imfs/imfs_directory.c +++ b/cpukit/libfs/src/imfs/imfs_directory.c @@ -74,8 +74,8 @@ int imfs_dir_open( ssize_t imfs_dir_read( rtems_libio_t *iop, - void *buffer, - uint32_t count + void *buffer, + size_t count ) { /* diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c index 4b4dc8ccce..799715f06c 100644 --- a/cpukit/libfs/src/imfs/memfile.c +++ b/cpukit/libfs/src/imfs/memfile.c @@ -154,7 +154,7 @@ int memfile_close( ssize_t memfile_read( rtems_libio_t *iop, void *buffer, - uint32_t count + size_t count ) { IMFS_jnode_t *the_jnode; @@ -173,7 +173,7 @@ ssize_t memfile_read( ssize_t memfile_write( rtems_libio_t *iop, const void *buffer, - uint32_t count + size_t count ) { IMFS_jnode_t *the_jnode; diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c index ea71eae395..e536c21d69 100644 --- a/cpukit/libnetworking/lib/ftpfs.c +++ b/cpukit/libnetworking/lib/ftpfs.c @@ -963,7 +963,7 @@ int rtems_ftp_open( ssize_t rtems_ftp_read( rtems_libio_t *iop, void *buffer, - uint32_t count + size_t count ) { int eno = 0; @@ -1017,7 +1017,7 @@ ssize_t rtems_ftp_read( ssize_t rtems_ftp_write( rtems_libio_t *iop, const void *buffer, - uint32_t count + size_t count ) { int eno = EIO; diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c index 0c0d21eaa9..2561fc3e49 100644 --- a/cpukit/libnetworking/lib/tftpDriver.c +++ b/cpukit/libnetworking/lib/tftpDriver.c @@ -794,7 +794,7 @@ static int rtems_tftp_open( static ssize_t rtems_tftp_read( rtems_libio_t *iop, void *buffer, - uint32_t count + size_t count ) { char *bp; @@ -935,7 +935,7 @@ static int rtems_tftp_close( static ssize_t rtems_tftp_write( rtems_libio_t *iop, const void *buffer, - uint32_t count + size_t count ) { const char *bp; diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c index 30de3ca3da..d43d24dc7d 100644 --- a/cpukit/libnetworking/rtems/rtems_syscall.c +++ b/cpukit/libnetworking/rtems/rtems_syscall.c @@ -689,13 +689,13 @@ rtems_bsdnet_close (rtems_libio_t *iop) } static ssize_t -rtems_bsdnet_read (rtems_libio_t *iop, void *buffer, uint32_t count) +rtems_bsdnet_read (rtems_libio_t *iop, void *buffer, size_t count) { return recv (iop->data0, buffer, count, 0); } static ssize_t -rtems_bsdnet_write (rtems_libio_t *iop, const void *buffer, uint32_t count) +rtems_bsdnet_write (rtems_libio_t *iop, const void *buffer, size_t count) { return send (iop->data0, buffer, count, 0); } -- cgit v1.2.3