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/H5FDmulti.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/H5FDmulti.c')
-rw-r--r-- | src/H5FDmulti.c | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 168bbe1..9226624 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -35,6 +35,15 @@ #define TRUE 1 #endif +/* Windows doesn't like some POSIX names and redefines them with an + * underscore + */ +#ifdef _WIN32 +#define my_strdup _strdup +#else +#define my_strdup strdup +#endif + /* Loop through all mapped files */ #define UNIQUE_MEMBERS_CORE(MAP, ITER, SEEN, LOOPVAR) \ { \ @@ -103,9 +112,8 @@ typedef struct H5FD_multi_dxpl_t { } H5FD_multi_dxpl_t; /* Private functions */ -static char *my_strdup(const char *s); -static int compute_next(H5FD_multi_t *file); -static int open_members(H5FD_multi_t *file); +static int compute_next(H5FD_multi_t *file); +static int open_members(H5FD_multi_t *file); /* Callback prototypes */ static herr_t H5FD_multi_term(void); @@ -172,36 +180,6 @@ static const H5FD_class_t H5FD_multi_g = { }; /*------------------------------------------------------------------------- - * Function: my_strdup - * - * Purpose: Private version of strdup() - * - * Return: Success: Ptr to new copy of string - * - * Failure: NULL - * - * Programmer: Robb Matzke - * Friday, August 13, 1999 - * - *------------------------------------------------------------------------- - */ -static char * -my_strdup(const char *s) -{ - char * x; - size_t str_len; - - if (!s) - return NULL; - str_len = strlen(s) + 1; - if (NULL == (x = (char *)malloc(str_len))) - return NULL; - memcpy(x, s, str_len); - - return x; -} - -/*------------------------------------------------------------------------- * Function: H5FD_multi_init * * Purpose: Initialize this driver by registering the driver with the |