HDFFV-10143 change h5PLget to use buffer like H5Iget_name

2 files changed, 33 insertions, 32 deletions

diff --git a/src/H5PL.c b/src/H5PL.c
index 4bf19fc..0957629 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -428,19 +428,15 @@ H5PLappend(const char* plugin_path)
     if(NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
     dl_path = H5MM_strdup(plugin_path);
-    if(NULL == dl_path)
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
 
     H5PL_path_table_g[H5PL_num_paths_g] = dl_path;
-    dl_path = NULL;
     H5PL_num_paths_g++;
 
 done:
-    if(dl_path)
-        dl_path = (char *)H5MM_xfree(dl_path);
-
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLappend() */
 
@@ -466,8 +462,7 @@ H5PLprepend(const char* plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
     if(NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    dl_path = H5MM_strdup(plugin_path);
-    if(NULL == dl_path)
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
@@ -475,13 +470,9 @@ H5PLprepend(const char* plugin_path)
     for (plindex = (unsigned int)H5PL_num_paths_g; plindex > 0; plindex--)
         H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
     H5PL_path_table_g[0] = dl_path;
-    dl_path = NULL;
     H5PL_num_paths_g++;
 
 done:
-    if (dl_path)
-        dl_path = (char *)H5MM_xfree(dl_path);
-
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLprepend() */
 
@@ -504,8 +495,7 @@ H5PLreplace(const char* plugin_path, unsigned int index)
     FUNC_ENTER_API(FAIL)
     if(NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    dl_path = H5MM_strdup(plugin_path);
-    if(NULL == dl_path)
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
@@ -513,12 +503,8 @@ H5PLreplace(const char* plugin_path, unsigned int index)
     if(H5PL_path_table_g[index])
         H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
     H5PL_path_table_g[index] = dl_path;
-    dl_path = NULL;
 
 done:
-    if(dl_path)
-        dl_path = (char *)H5MM_xfree(dl_path);
-
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLreplace() */
 
@@ -544,8 +530,7 @@ H5PLinsert(const char* plugin_path, unsigned int index)
         HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
     if(NULL == plugin_path)
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    dl_path = H5MM_strdup(plugin_path);
-    if(NULL == dl_path)
+    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
         HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
 
     H5PL_EXPAND_ENV_VAR
@@ -553,13 +538,9 @@ H5PLinsert(const char* plugin_path, unsigned int index)
     for(plindex = (unsigned int)H5PL_num_paths_g; plindex > index; plindex--)
         H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
     H5PL_path_table_g[index] = dl_path;
-    dl_path = NULL;
     H5PL_num_paths_g++;
 
 done:
-    if(dl_path)
-        dl_path = (char *)H5MM_xfree(dl_path);
-
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLinsert() */
 
@@ -602,20 +583,40 @@ done:
  *
  * Purpose: Query the plugin path at the specified index.
  *
- * Return:      Non-NULL on success/NULL on failure
+ * Return: Success: The length of path.
+ *
+ *  If `pathname' is non-NULL then write up to `size' bytes into that
+ *  buffer and always return the length of the pathname.
+ *  Otherwise `size' is ignored and the function does not store the pathname,
+ *  just returning the number of characters required to store the pathname.
+ *  If an error occurs then the buffer pointed to by `pathname' (NULL or non-NULL)
+ *  is unchanged and the function returns a negative value.
+ *  If a zero is returned for the name's length, then there is no pathname
+ *  associated with the index.
  *
  *-------------------------------------------------------------------------
  */
-const char*
-H5PLget(unsigned int index)
+ssize_t
+H5PLget(unsigned int index, char *pathname/*out*/, size_t size)
 {
-    char* ret_value = NULL; /* Return value */
+    ssize_t      ret_value = FAIL;    /* Return value */
+    ssize_t      len = 0;      /* Length of pathname */
+    char        *dl_path = NULL;
 
-    FUNC_ENTER_API(NULL)
+    FUNC_ENTER_API(FAIL)
     if(H5PL_num_paths_g == 0)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, NULL, "no directories in table")
-    if(NULL == (ret_value = H5PL_path_table_g[index]))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, NULL, "no directory path at index")
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
+    if(NULL == (dl_path = H5PL_path_table_g[index]))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
+    len = HDstrlen(dl_path);
+    if(pathname) {
+        HDstrncpy(pathname, dl_path, MIN((size_t)(len + 1), size));
+        if((size_t)len >= size)
+            pathname[size - 1] = '\0';
+    } /* end if */
+
+    /* Set return value */
+    ret_value = len;
 
 done:
     FUNC_LEAVE_API(ret_value)
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index ca46542..5e4dcae 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -49,7 +49,7 @@ H5_DLL herr_t H5PLprepend(const char* plugin_path);
 H5_DLL herr_t H5PLreplace(const char* plugin_path, unsigned int index);
 H5_DLL herr_t H5PLinsert(const char* plugin_path, unsigned int index);
 H5_DLL herr_t H5PLremove(unsigned int index);
-H5_DLL const char* H5PLget(unsigned int index);
+H5_DLL ssize_t H5PLget(unsigned int index, char *pathname/*out*/, size_t size);
 H5_DLL unsigned int H5PLsize(void);
 
 #ifdef __cplusplus