mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20515] Description:

Browse Source 
Remove old, uneeded configuration customizations for FreeBSD systems.
(config/freebsd)

	Also, convert a large stack variable into a dynamic memory allocation
and clean up a few compiler warnings (tools/h5dump/h5dumpgentest.c)

Tested on:
	FreeBSD/32 8.2 (loyalty) w/debug & production
	FreeBSD/64 8.2 (freedom) w/debug & production
This commit is contained in:
Quincey Koziol 2011-04-15 14:20:33 -05:00
parent 427add7c92
commit 7ff9a8b54a
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/freebsd
View File

@ -26,13 +26,6 @@ if test "X-" = "X-$CC"; then
CC_BASENAME=gcc
fi
# Add "_XOPEN_SOURCE" define to cpp flags, to quiet warnings
# from /usr/include/sys/cdefs.h
# (Unless we are using g++ as a C compiler)
#if test "X-g++" != "X-$CC"; then
# H5_CPPFLAGS="$H5_CPPFLAGS -D_XOPEN_SOURCE=600"
#fi
# Figure out C compiler flags
. $srcdir/config/gnu-flags
@ -63,14 +56,3 @@ fi
# Figure out Intel F90 compiler flags
. $srcdir/config/intel-fflags
# Special setup to use pthread support if enable-threadsafe is on.
# Works with static executable only.
if test "X-" != "X-$enable_threadsafe"; then
H5_CFLAGS="$H5_CFLAGS -D_THREAD_SAFE"
H5_CXXFLAGS="$H5_CXXFLAGS -D_THREAD_SAFE"
AM_LDFLAGS="$AM_LDFLAGS -pthread"
fi
# Temporarily hard set this variable. The problem of loss of the last 2 bytes of mantissa
# turns out to be elusive. Hard set it until a better solution is found.
hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_works='no'}

19
tools/h5dump/h5dumpgentest.c
View File

@ -2825,7 +2825,7 @@ static void gent_vldatatypes5(void)
static void gent_array1_big(void)
{
int wdata[SPACE_ARRAY1BIG_DIM][ARRAY1BIG_DIM]; /* Information to write */
int *wdata; /* Information to write */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
hid_t sid1; /* Dataspace ID */
@ -2845,24 +2845,27 @@ static void gent_array1_big(void)
hsize_t count[SPACE1_RANK]; /* Element count of hyperslab */
hsize_t block[SPACE1_RANK]; /* Block size of hyperslab */
hdset_reg_ref_t *wbuf; /* buffer to write to disk */
start[0] = 0;
stride[0] = 1;
count[0] = 999;
block[0] = 1;
/* Allocate write & read buffers */
wbuf = (hdset_reg_ref_t*) calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1);
wdata = (int *)malloc(sizeof(int) * (size_t)(SPACE_ARRAY1BIG_DIM * ARRAY1BIG_DIM));
/* Allocate and initialize array data to write */
for(i=0; i<SPACE_ARRAY1BIG_DIM; i++)
for(j=0; j<ARRAY1BIG_DIM; j++)
wdata[i][j]=i*1;
for(i = 0; i < SPACE_ARRAY1BIG_DIM; i++)
for(j = 0; j < ARRAY1BIG_DIM; j++)
*(wdata + (i * ARRAY1BIG_DIM) + j) = i * 1;
/* Create file */
fid1 = H5Fcreate(FILE25_BIG, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
/*-------------------------
* Array type dataset
*
*/
/* Create dataspace for datasets */
sid1 = H5Screate_simple(SPACE1_RANK, sdims1, NULL);
@ -2905,6 +2908,10 @@ static void gent_array1_big(void)
assert(ret >= 0);
ret = H5Fclose(fid1);
assert(ret >= 0);
/* Release memory */
free(wbuf);
free(wdata);
}
static void gent_array1(void)
@ -6918,7 +6925,7 @@ gent_packedbits(void)
double dsetdbl[F67_XDIM][F67_YDIM8];
unsigned int i, j;
fid = H5Fcreate(FILE66, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
fid = H5Fcreate(FILE67, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
/* Dataset of 8 bits unsigned int */
dims[0] = F67_XDIM; dims[1] = F67_YDIM8;