diff options
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libblock/src/ramdisk-config.c | 7 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index cb7f68b045..511e1d7e26 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2010-03-04 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libblock/src/ramdisk-config.c, sapi/include/confdefs.h: + CONFIGURE_DISABLE_CLASSIC_NOTEPADS is typo of + CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS. Fix it. + 2010-03-04 Chris Johns <chrisj@rtems.org> * libcsupport/include/rtems/libio.h, libcsupport/src/_rename_r.c: diff --git a/cpukit/libblock/src/ramdisk-config.c b/cpukit/libblock/src/ramdisk-config.c index 8ac513cdef..40d205f833 100644 --- a/cpukit/libblock/src/ramdisk-config.c +++ b/cpukit/libblock/src/ramdisk-config.c @@ -35,7 +35,7 @@ ramdisk_initialize( return rc; /* - * Coverity Id 27 notes that this calloc() is a resource leak. + * Coverity Id 27 & 31 note that this calloc() is a resource leak. * * This is allocating memory for a RAM disk which will persist for * the life of the system. RTEMS has no "de-initialize" driver call @@ -82,5 +82,10 @@ ramdisk_initialize( r->initialized = false; } } + /* + * We need to tell Coverity that we know we are returning without + * freeing r. This looks suspiciously like a leak. :) + */ + /* coverity[leaked_storage : FALSE] */ return RTEMS_SUCCESSFUL; } diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 5b6ecadfa6..283b4ce581 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -26,7 +26,7 @@ */ /* - * COPYRIGHT (c) 1989-2009. + * COPYRIGHT (c) 1989-2010. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -875,7 +875,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #define CONFIGURE_NOTEPADS_ENABLED FALSE #endif - #ifndef CONFIGURE_DISABLE_CLASSIC_NOTEPADS + #ifndef CONFIGURE_DISABLE_CLASSIC_API_NOTEPADS #define CONFIGURE_MEMORY_PER_TASK_FOR_CLASSIC_API \ _Configure_From_workspace( sizeof(RTEMS_API_Control) ) #else |