diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2013-03-13 22:34:23 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2013-03-13 22:34:23 (GMT) |
commit | 08359be858ae9e4595dab1f4a7718017d9af7663 (patch) | |
tree | bbe033fd134cfda5943dff96ef2a7f5f10d743e9 /src/H5Oname.c | |
parent | 55822485c64197a6c2c4a623824fcdcd10a57d31 (diff) | |
download | hdf5-08359be858ae9e4595dab1f4a7718017d9af7663.zip hdf5-08359be858ae9e4595dab1f4a7718017d9af7663.tar.gz hdf5-08359be858ae9e4595dab1f4a7718017d9af7663.tar.bz2 |
[svn-r23347] ported revision 23248:23346 from the trunk
Diffstat (limited to 'src/H5Oname.c')
-rw-r--r-- | src/H5Oname.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Oname.c b/src/H5Oname.c index fb44000..c1cb8c8 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -97,10 +97,10 @@ H5O_name_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, HDassert(p); /* decode */ - if(NULL == (mesg = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))) || - NULL == (mesg->s = (char *)H5MM_malloc(HDstrlen((const char *)p) + 1))) + if(NULL == (mesg = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t)))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + if(NULL == (mesg->s = (char *)H5MM_strdup((const char *)p))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") - HDstrcpy(mesg->s, (const char *)p); /* Set return value */ ret_value = mesg; @@ -138,9 +138,9 @@ H5O_name_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, cons FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ - assert(f); - assert(p); - assert(mesg && mesg->s); + HDassert(f); + HDassert(p); + HDassert(mesg && mesg->s); /* encode */ HDstrcpy((char*)p, mesg->s); |