diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-06-24 22:01:49 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-06-24 22:01:49 +0000 |
commit | 4d32a76de07c6a5ae3e9a2b2180709bfe3c9567e (patch) | |
tree | 477e29cf498d449200770c35e709e73dfacdffc6 /cpukit | |
parent | 2010-06-24 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
download | rtems-4d32a76de07c6a5ae3e9a2b2180709bfe3c9567e.tar.bz2 |
2010-06-24 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libfs/src/imfs/memfile.c: Fix assert.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/memfile.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index db4f81cb0e..a9f2333d76 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,9 @@ 2010-06-24 Joel Sherrill <joel.sherrilL@OARcorp.com> + * libfs/src/imfs/memfile.c: Fix assert. + +2010-06-24 Joel Sherrill <joel.sherrilL@OARcorp.com> + * libcsupport/src/read.c, libcsupport/src/write.c: read(2) and write(2) should return 0 when passed a count of 0 after verifying other possible errors. diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c index a1193c8c88..61e949a7ef 100644 --- a/cpukit/libfs/src/imfs/memfile.c +++ b/cpukit/libfs/src/imfs/memfile.c @@ -596,6 +596,7 @@ MEMFILE_STATIC ssize_t IMFS_memfile_read( #if defined(RTEMS_DEBUG) assert( the_jnode ); assert( the_jnode->type == IMFS_MEMORY_FILE || + the_jnode->type != IMFS_LINEAR_FILE ); assert( dest ); #endif if ( !the_jnode ) |