Move some static functions and variables to .c files to avoid unused

function/variable warnings.
This commit is contained in:
David Young 2019-11-13 11:35:00 -06:00
parent 98c4ed49e8
commit 833c0a2fc6
4 changed files with 106 additions and 54 deletions

61
test/H5srcdir.c Normal file
View File

@ -0,0 +1,61 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "H5private.h"
#include "H5srcdir.h"
/* Buffer to construct path in and return pointer to */
char srcdir_path[1024] = "";
/* Buffer to construct file in and return pointer to */
char srcdir_testpath[1024] = "";
/* Just return the srcdir path */
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)) {
HDsnprintf(srcdir_path, sizeof(srcdir_path), "%s/", srcdir);
return(srcdir_path);
} /* end if */
else
return(NULL);
} /* end H5_get_srcdir() */
/* Append the test file name to the srcdir path and return the whole string */
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() */

View File

@ -24,47 +24,16 @@
#include "H5srcdir_str.h"
/* Buffer to construct path in and return pointer to */
static char srcdir_path[1024] = "";
extern char srcdir_path[1024];
/* Buffer to construct file in and return pointer to */
static char srcdir_testpath[1024] = "";
extern char srcdir_testpath[1024];
/* 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)) {
HDsnprintf(srcdir_path, sizeof(srcdir_path), "%s/", srcdir);
return(srcdir_path);
} /* end if */
else
return(NULL);
} /* end H5_get_srcdir() */
const char *H5_get_srcdir(void);
/* 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();
const char *H5_get_srcdir_filename(const char *);
/* 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 */

View File

@ -84,31 +84,17 @@
#define N_PLANES_TO_WRITE 25
/* Planes */
static hsize_t PLANES[N_SOURCES][RANK] = {
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH},
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH},
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH}
};
extern hsize_t PLANES[N_SOURCES][RANK];
/* File names for source datasets */
static char FILE_NAMES[N_SOURCES][NAME_LEN] = {
{"vds_swmr_src_a.h5"},
{"vds_swmr_src_b.h5"},
{"vds_swmr_src_c.h5"},
{"vds_swmr_src_d.h5"},
{"vds_swmr_src_e.h5"},
{"vds_swmr_src_f.h5"}
};
extern char FILE_NAMES[N_SOURCES][NAME_LEN];
/* VDS file name */
static char VDS_FILE_NAME[NAME_LEN] = "vds_swmr.h5";
extern char VDS_FILE_NAME[NAME_LEN];
/* Dataset names */
static char SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
static char VDS_DSET_NAME[NAME_LEN] = "vds_dset";
extern char SOURCE_DSET_PATH[NAME_LEN];
extern char VDS_DSET_NAME[NAME_LEN];
/* Fill values */
#endif /* VDS_SWMR_H */

36
test/vds_swmr_common.c Normal file
View File

@ -0,0 +1,36 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "vds_swmr.h"
hsize_t PLANES[N_SOURCES][RANK] = {
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH},
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH},
{1, SM_HEIGHT, WIDTH},
{1, LG_HEIGHT, WIDTH}
};
char FILE_NAMES[N_SOURCES][NAME_LEN] = {
{"vds_swmr_src_a.h5"},
{"vds_swmr_src_b.h5"},
{"vds_swmr_src_c.h5"},
{"vds_swmr_src_d.h5"},
{"vds_swmr_src_e.h5"},
{"vds_swmr_src_f.h5"}
};
char VDS_FILE_NAME[NAME_LEN] = "vds_swmr.h5";
char SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
char VDS_DSET_NAME[NAME_LEN] = "vds_dset";