diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-03-31 20:52:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 20:52:57 (GMT) |
| commit | 78fe6751b5a682111e8bc2bf7ce944c55d52ba56 (patch) | |
| tree | 91f9e6f19e041d1845b6b21cebda95fb3b1706ef /src/H5MM.c | |
| parent | 0f0721f2d616ac9edd7cea642baa176c87713757 (diff) | |
| download | hdf5-78fe6751b5a682111e8bc2bf7ce944c55d52ba56.zip hdf5-78fe6751b5a682111e8bc2bf7ce944c55d52ba56.tar.gz hdf5-78fe6751b5a682111e8bc2bf7ce944c55d52ba56.tar.bz2 | |
Removes implementation of my_strdup() from the multi VFD (#527)
* Committing clang-format changes
* Removes my_strdup() from the multi VFD
* Use strdup directly when memory sanity checks are off
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5MM.c')
| -rw-r--r-- | src/H5MM.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -449,11 +449,17 @@ H5MM_xstrdup(const char *s) FUNC_ENTER_NOAPI(NULL) +#if defined H5_MEMORY_ALLOC_SANITY_CHECK if (s) { if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") HDstrcpy(ret_value, s); - } /* end if */ + } +#else + if (s) + if (NULL == (ret_value = HDstrdup(s))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "string duplication failed") +#endif done: FUNC_LEAVE_NOAPI(ret_value) @@ -483,10 +489,15 @@ H5MM_strdup(const char *s) FUNC_ENTER_NOAPI(NULL) if (!s) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "NULL string not allowed") +#if defined H5_MEMORY_ALLOC_SANITY_CHECK if (NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") HDstrcpy(ret_value, s); +#else + if (NULL == (ret_value = HDstrdup(s))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "string duplication failed") +#endif done: FUNC_LEAVE_NOAPI(ret_value) |