diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2016-07-07 18:54:11 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-07-07 18:54:11 (GMT) |
commit | ec2fbe0883f9e76df60bcfbebbd4b6f62d5a09e6 (patch) | |
tree | bd27f9b92053818b5d83de373dfcadbbbc892ee2 /test/H5srcdir.h | |
parent | 3e5a61c9ff7a22589dbb2fc71f95f32f919c8b54 (diff) | |
download | hdf5-ec2fbe0883f9e76df60bcfbebbd4b6f62d5a09e6.zip hdf5-ec2fbe0883f9e76df60bcfbebbd4b6f62d5a09e6.tar.gz hdf5-ec2fbe0883f9e76df60bcfbebbd4b6f62d5a09e6.tar.bz2 |
[svn-r30158] Description:
More warning cleanups. This brings us down to ~1300 warnings in 167 files
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial & parallel
(h5committest forthcoming)
Diffstat (limited to 'test/H5srcdir.h')
-rw-r--r-- | test/H5srcdir.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/test/H5srcdir.h b/test/H5srcdir.h index 81624d8..2f04295 100644 --- a/test/H5srcdir.h +++ b/test/H5srcdir.h @@ -31,26 +31,9 @@ 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)) { - HDsnprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s/%s", srcdir, filename); - return(srcdir_testpath); - } /* end if */ - else - return(NULL); -} - /* Just return the srcdir path */ -static const char *H5_get_srcdir(void) +static const char * +H5_get_srcdir(void) { const char *srcdir = HDgetenv("srcdir"); @@ -65,6 +48,25 @@ static const char *H5_get_srcdir(void) } /* end if */ else return(NULL); -} +} /* end H5_get_srcdir() */ + +/* 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 = H5_get_srcdir(); + + /* Check for error */ + if(NULL == srcdir) + return(NULL); + else { + /* Build path to test file */ + if((HDstrlen(srcdir) + HDstrlen(filename) + 1) < sizeof(srcdir_testpath)) { + HDsnprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s%s", srcdir, filename); + return(srcdir_testpath); + } /* end if */ + else + return(NULL); + } /* end else */ +} /* end H5_get_srcdir_filename() */ #endif /* _H5SRCDIR_H */ |