summaryrefslogtreecommitdiffstats
path: root/src/H5MF.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5MF.c')
-rw-r--r--src/H5MF.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/H5MF.c b/src/H5MF.c
index 564b183..285c0fa 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -114,8 +114,9 @@ H5MF_init_merge_flags(H5F_t *f)
H5MF_aggr_merge_t mapping_type; /* Type of free list mapping */
H5FD_mem_t type; /* Memory type for iteration */
hbool_t all_same; /* Whether all the types map to the same value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5MF_init_merge_flags)
+ FUNC_ENTER_NOAPI(H5MF_init_merge_flags, FAIL)
/* check args */
HDassert(f);
@@ -192,9 +193,13 @@ H5MF_init_merge_flags(H5F_t *f)
/* Merge all allocation types together */
HDmemset(f->shared->fs_aggr_merge, (H5F_FS_MERGE_METADATA | H5F_FS_MERGE_RAWDATA), sizeof(f->shared->fs_aggr_merge));
break;
+
+ default:
+ HGOTO_ERROR(H5E_RESOURCE, H5E_BADVALUE, FAIL, "invalid mapping type")
} /* end switch */
- FUNC_LEAVE_NOAPI(SUCCEED)
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5MF_init_merge_flags() */