summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-09-14 21:01:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-09-14 21:01:39 +0000
commitd32359a77870a330080ff22a67ab07b0aa2ff724 (patch)
treea514e916cc5a7bd251eb174d1dc76fe4b9357c46
parent2002-09-14 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-d32359a77870a330080ff22a67ab07b0aa2ff724.tar.bz2
2002-09-14 Joel Sherrill <joel@OARcorp.com>
* src/dosfs/fat.c, src/imfs/deviceio.c, src/imfs/imfs.h, src/imfs/imfs_directory.c, src/imfs/imfs_fchmod.c, src/imfs/memfile.c: Eliminated warnings. A lot of this focus was on changing read and write entry points to return ssize_t as read(2) and write(2) now do.
-rw-r--r--cpukit/libfs/ChangeLog8
-rw-r--r--cpukit/libfs/src/dosfs/fat.c3
-rw-r--r--cpukit/libfs/src/imfs/deviceio.c8
-rw-r--r--cpukit/libfs/src/imfs/imfs.h10
-rw-r--r--cpukit/libfs/src/imfs/imfs_directory.c2
-rw-r--r--cpukit/libfs/src/imfs/imfs_fchmod.c7
-rw-r--r--cpukit/libfs/src/imfs/memfile.c14
7 files changed, 34 insertions, 18 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index d0859ac459..3489bf9cd5 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-14 Joel Sherrill <joel@OARcorp.com>
+
+ * src/dosfs/fat.c, src/imfs/deviceio.c, src/imfs/imfs.h,
+ src/imfs/imfs_directory.c, src/imfs/imfs_fchmod.c,
+ src/imfs/memfile.c: Eliminated warnings. A lot of this focus
+ was on changing read and write entry points to return ssize_t
+ as read(2) and write(2) now do.
+
2002-07-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Remove.
diff --git a/cpukit/libfs/src/dosfs/fat.c b/cpukit/libfs/src/dosfs/fat.c
index 852c104781..1b37a22ff5 100644
--- a/cpukit/libfs/src/dosfs/fat.c
+++ b/cpukit/libfs/src/dosfs/fat.c
@@ -20,6 +20,7 @@
#include <rtems/libio_.h>
#include "fat.h"
+#include "fat_fat_operations.h"
/* _fat_block_read --
* This function reads 'count' bytes from device filesystem is mounted on,
@@ -692,4 +693,4 @@ fat_fat32_update_fsinfo_sector(
return RC_OK;
}
- \ No newline at end of file
+
diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c
index eafc48ec4e..0d4286ab8c 100644
--- a/cpukit/libfs/src/imfs/deviceio.c
+++ b/cpukit/libfs/src/imfs/deviceio.c
@@ -130,7 +130,7 @@ int device_close(
* This handler maps a read() operation onto rtems_io_read().
*/
-int device_read(
+ssize_t device_read(
rtems_libio_t *iop,
void *buffer,
unsigned32 count
@@ -158,7 +158,7 @@ int device_read(
if ( status )
return rtems_deviceio_errno(status);
- return args.bytes_moved;
+ return (ssize_t) args.bytes_moved;
}
/*
@@ -167,7 +167,7 @@ int device_read(
* This handler maps a write() operation onto rtems_io_write().
*/
-int device_write(
+ssize_t device_write(
rtems_libio_t *iop,
const void *buffer,
unsigned32 count
@@ -195,7 +195,7 @@ int device_write(
if ( status )
return rtems_deviceio_errno(status);
- return args.bytes_moved;
+ return (ssize_t) args.bytes_moved;
}
/*
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h
index 4113553768..83f608844e 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/libfs/src/imfs/imfs.h
@@ -395,7 +395,7 @@ int imfs_dir_close(
rtems_libio_t *iop /* IN */
);
-int imfs_dir_read(
+ssize_t imfs_dir_read(
rtems_libio_t *iop, /* IN */
void *buffer, /* IN */
unsigned32 count /* IN */
@@ -439,13 +439,13 @@ int memfile_close(
rtems_libio_t *iop /* IN */
);
-int memfile_read(
+ssize_t memfile_read(
rtems_libio_t *iop, /* IN */
void *buffer, /* IN */
unsigned32 count /* IN */
);
-int memfile_write(
+ssize_t memfile_write(
rtems_libio_t *iop, /* IN */
const void *buffer, /* IN */
unsigned32 count /* IN */
@@ -478,13 +478,13 @@ int device_close(
rtems_libio_t *iop /* IN */
);
-int device_read(
+ssize_t device_read(
rtems_libio_t *iop, /* IN */
void *buffer, /* IN */
unsigned32 count /* IN */
);
-int device_write(
+ssize_t device_write(
rtems_libio_t *iop, /* IN */
const void *buffer, /* IN */
unsigned32 count /* IN */
diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c
index dec1e0ec2d..5aa975c81d 100644
--- a/cpukit/libfs/src/imfs/imfs_directory.c
+++ b/cpukit/libfs/src/imfs/imfs_directory.c
@@ -72,7 +72,7 @@ int imfs_dir_open(
* size of a directory entry.
*/
-int imfs_dir_read(
+ssize_t imfs_dir_read(
rtems_libio_t *iop,
void *buffer,
unsigned32 count
diff --git a/cpukit/libfs/src/imfs/imfs_fchmod.c b/cpukit/libfs/src/imfs/imfs_fchmod.c
index cf7c644793..0b14da1b43 100644
--- a/cpukit/libfs/src/imfs/imfs_fchmod.c
+++ b/cpukit/libfs/src/imfs/imfs_fchmod.c
@@ -30,6 +30,13 @@ int IMFS_fchmod(
#if defined(RTEMS_POSIX_API)
uid_t st_uid;
#endif
+ int IMFS_memfile_write(
+ IMFS_jnode_t *the_jnode,
+ off_t start,
+ const unsigned char *source,
+ unsigned int length
+ );
+
jnode = loc->node_access;
diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c
index cfa37c20c6..711e0c0383 100644
--- a/cpukit/libfs/src/imfs/memfile.c
+++ b/cpukit/libfs/src/imfs/memfile.c
@@ -59,14 +59,14 @@ MEMFILE_STATIC block_p *IMFS_memfile_get_block_pointer(
int malloc_it
);
-MEMFILE_STATIC int IMFS_memfile_read(
+MEMFILE_STATIC ssize_t IMFS_memfile_read(
IMFS_jnode_t *the_jnode,
off_t start,
unsigned char *destination,
unsigned int length
);
-MEMFILE_STATIC int IMFS_memfile_write(
+ssize_t IMFS_memfile_write( /* cannot be static as used in imfs_fchmod.c */
IMFS_jnode_t *the_jnode,
off_t start,
const unsigned char *source,
@@ -131,7 +131,7 @@ int memfile_close(
* This routine processes the read() system call.
*/
-int memfile_read(
+ssize_t memfile_read(
rtems_libio_t *iop,
void *buffer,
unsigned32 count
@@ -150,14 +150,14 @@ int memfile_read(
* This routine processes the write() system call.
*/
-int memfile_write(
+ssize_t memfile_write(
rtems_libio_t *iop,
const void *buffer,
unsigned32 count
)
{
IMFS_jnode_t *the_jnode;
- int status;
+ ssize_t status;
the_jnode = iop->file_info;
@@ -541,7 +541,7 @@ int IMFS_memfile_remove(
* read).
*/
-MEMFILE_STATIC int IMFS_memfile_read(
+MEMFILE_STATIC ssize_t IMFS_memfile_read(
IMFS_jnode_t *the_jnode,
off_t start,
unsigned char *destination,
@@ -691,7 +691,7 @@ MEMFILE_STATIC int IMFS_memfile_read(
* file pointed to by the_jnode. The file is extended as needed.
*/
-MEMFILE_STATIC int IMFS_memfile_write(
+MEMFILE_STATIC ssize_t IMFS_memfile_write(
IMFS_jnode_t *the_jnode,
off_t start,
const unsigned char *source,