forked from Imagelibrary/rtems
2003-07-24 jennifer averett <jennifer.averett@OARcorp.com>
PR 434/filesystem * src/imfs/imfs_init.c: Modified to return error code * src/imfs/miniimfs_init.c: Modified to return error code * src/imfs/imfs_initsup.c: Modified to set error upon memory failure.
This commit is contained in:
@@ -60,12 +60,11 @@ int IMFS_initialize(
|
||||
rtems_filesystem_mount_table_entry_t *temp_mt_entry
|
||||
)
|
||||
{
|
||||
IMFS_initialize_support(
|
||||
return IMFS_initialize_support(
|
||||
temp_mt_entry,
|
||||
&IMFS_ops,
|
||||
&IMFS_linearfile_handlers,
|
||||
&IMFS_memfile_handlers,
|
||||
&IMFS_directory_handlers
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "imfs.h"
|
||||
#include <rtems/libio_.h>
|
||||
#include <rtems/seterr.h>
|
||||
|
||||
#if defined(IMFS_DEBUG)
|
||||
#include <stdio.h>
|
||||
@@ -68,7 +69,7 @@ int IMFS_initialize_support(
|
||||
fs_info = calloc( 1, sizeof( IMFS_fs_info_t ) );
|
||||
if ( !fs_info ){
|
||||
free(temp_mt_entry->mt_fs_root.node_access);
|
||||
return 1;
|
||||
rtems_set_errno_and_return_minus_one(ENOMEM);
|
||||
}
|
||||
temp_mt_entry->fs_info = fs_info;
|
||||
|
||||
|
||||
@@ -60,14 +60,13 @@ int miniIMFS_initialize(
|
||||
rtems_filesystem_mount_table_entry_t *temp_mt_entry
|
||||
)
|
||||
{
|
||||
IMFS_initialize_support(
|
||||
return IMFS_initialize_support(
|
||||
temp_mt_entry,
|
||||
&miniIMFS_ops,
|
||||
&rtems_filesystem_null_handlers, /* for linearfiles */
|
||||
&rtems_filesystem_null_handlers, /* for memfiles */
|
||||
&rtems_filesystem_null_handlers /* for directories */
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user