[svn-r18418] Description:

    Centralize common code for srcdir lookups.

Tested on:
    Mac OS X/32 10.6.2 (amazon) w/debug & prod
    Linux/32 2.6 (jam)

1 files changed, 0 insertions, 45 deletions

diff --git a/hl/test/H5srcdir.h.in b/hl/test/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/hl/test/H5srcdir.h.in
+++ b/hl/test/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-