summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-27 17:42:52 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-27 17:42:52 +0000
commit5c758d1a8c48b1ca97e7e13140b9d22e17f2382e (patch)
treebd7a517df285ce53ef6679de34ff961389fc6fb5
parent2010-08-27 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff)
downloadrtems-5c758d1a8c48b1ca97e7e13140b9d22e17f2382e.tar.bz2
2010-08-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1693/filesystem * libfs/src/imfs/memfile.c: IMFS_memfile_get_block_pointer() was checking incorrect pointer and thus had dead code.
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libfs/src/imfs/memfile.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index a4b6c4c5de..8ed4404a0b 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
2010-08-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
+ PR 1693/filesystem
+ * libfs/src/imfs/memfile.c: IMFS_memfile_get_block_pointer() was
+ checking incorrect pointer and thus had dead code.
+
+2010-08-27 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
PR 1692/filesystem
* libcsupport/include/rtems/libio.h, libfs/src/imfs/imfs_eval.c: Fix
implementation and use of rtems_libio_is_valid_perms().
diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c
index f73c6ecf9d..f7b6d951a4 100644
--- a/cpukit/libfs/src/imfs/memfile.c
+++ b/cpukit/libfs/src/imfs/memfile.c
@@ -1046,7 +1046,7 @@ fflush(stdout);
return 0;
p2 = (block_p *)p1[ doubly ];
- if ( !p )
+ if ( !p2 )
return 0;
return (block_p *)&p2[ singly ];