mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-19 16:50:46 +08:00
[svn-r929] Changes since 19981119
---------------------- ./test/flush2.c ./test/overhead.c Removed carriage-returns inserted by a broken operating system. ./test/big.c ./test/mtime.c ./test/ragged.c ./tools/h5ls.c Removed inclusion of <H5config.h>, system header files, and definition of __unused__ since this all happens in <H5private.h>. ./test/chunk.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/extend.c ./test/external.c ./test/fillval.c ./test/flush1.c ./test/flush2.c ./test/iopipe.c ./test/links.c ./test/mount.c ./test/overhead.c ./test/shtype.c ./test/unlink.c ./tools/h5import.c ./tools/h5repart.c Removed inclusion of <H5config.h> since <hdf5.h> includes it. ./test/flush1.c Includes <stdlib.h>, protects inclusion of <unistd.h> by using HAVE_UNISTD_H instead of STDC_HEADERS.
This commit is contained in:
parent
68bff3d352
commit
e0dfe872a0
12
test/big.c
12
test/big.c
@ -8,18 +8,6 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
# include <ctype.h>
|
||||
# include <fcntl.h>
|
||||
# include <math.h>
|
||||
# include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
#include <H5private.h> /*needed for HDfprintf() and long_long*/
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -21,7 +21,6 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -17,8 +17,6 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
/* See H5private.h for how to include files */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -25,8 +25,6 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -29,8 +29,6 @@
|
||||
# include <sys/wait.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#define H5T_PACKAGE
|
||||
#include <H5Tpkg.h> /*to turn off hardware conversions*/
|
||||
|
||||
|
@ -10,15 +10,13 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#define TEST_FILE_NAME "extend.h5"
|
||||
#define NX 100 /* USE AN EVEN NUMBER!*/
|
||||
#define NY 100 /* USE AN EVEN NUMBER!*/
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -25,8 +25,6 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <fcntl.h>
|
||||
@ -22,8 +22,6 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
/*
|
||||
* Define NO_FILLING if you want to compare how this test works when there is
|
||||
* no fill value (that is, when the fill value is zero).
|
||||
|
@ -14,14 +14,17 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdio.h>
|
||||
# include <unistd.h>
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <sys/types.h>
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -22,8 +22,6 @@
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
@ -40,8 +40,6 @@
|
||||
#include <Winsock.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#define RAW_FILE_NAME "iopipe.raw"
|
||||
#define HDF5_FILE_NAME "iopipe.h5"
|
||||
#define HEADING "%-16s"
|
||||
|
@ -10,15 +10,13 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -10,14 +10,12 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
|
26
test/mtime.c
26
test/mtime.c
@ -13,35 +13,11 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
# include <math.h>
|
||||
#endif
|
||||
|
||||
#if defined(TIME_WITH_SYS_TIME)
|
||||
# include <sys/time.h>
|
||||
# include <time.h>
|
||||
#elif defined(HAVE_SYS_TIME_H)
|
||||
# include <sys/time.h>
|
||||
#else
|
||||
# include <time.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
#include <H5private.h> /*for HDdifftime()*/
|
||||
#include <H5private.h> /*for HDdifftime() and __unused__ */
|
||||
|
||||
#define FILE_NAME_1 "mtime.h5"
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
# define __unused__ /*void*/
|
||||
#else
|
||||
# define __unused__ __attribute__((unused))
|
||||
#endif
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: display_error_cb
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <ctype.h>
|
||||
@ -24,8 +24,6 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
@ -239,7 +237,7 @@ test(fill_t fill_style, const double splits[],
|
||||
if (verbose) {
|
||||
if (H5Fflush(file, H5F_SCOPE_LOCAL)<0) goto error;
|
||||
if (fstat(fd, &sb)<0) goto error;
|
||||
/*
|
||||
/*
|
||||
* The extra cast in the following statement is a bug workaround
|
||||
* for the Win32 version 5.0 compiler.
|
||||
* 1998-11-06 ptl
|
||||
@ -283,7 +281,8 @@ test(fill_t fill_style, const double splits[],
|
||||
* 1998-11-06 ptl
|
||||
*/
|
||||
printf("%-7s %8.3f\n", sname,
|
||||
(double)((hssize_t)((sb.st_size-cur_size[0]*sizeof(int))/cur_size[0])));
|
||||
(double)((hssize_t)((sb.st_size-cur_size[0]*sizeof(int))/
|
||||
cur_size[0])));
|
||||
|
||||
}
|
||||
close(fd);
|
||||
|
@ -8,19 +8,8 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
# include <signal.h>
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#include <H5private.h> /*for performance monitoring*/
|
||||
|
||||
|
||||
#define NOTIFY_INTERVAL 2 /*seconds*/
|
||||
#define TIME_LIMIT 60 /*seconds*/
|
||||
#define CH_SIZE 8192*8 /*approx chunk size in bytes*/
|
||||
|
@ -10,15 +10,13 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <assert.h>
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -10,14 +10,12 @@
|
||||
|
||||
/* See H5private.h for how to include headers */
|
||||
#undef NDEBUG
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
|
@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
/* See H5private.h for how to include system headers */
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
#ifdef STDC_HEADERS
|
||||
# include <fcntl.h>
|
||||
# include <string.h>
|
||||
@ -26,7 +26,6 @@
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
|
11
tools/h5ls.c
11
tools/h5ls.c
@ -9,19 +9,12 @@
|
||||
|
||||
/*
|
||||
* We include the private header file so we can get to the uniform
|
||||
* programming environment it declares.
|
||||
* programming environment it declares. Other than that, h5ls only calls
|
||||
* HDF5 API functions.
|
||||
*/
|
||||
#include <H5private.h>
|
||||
#include <h5tools.h>
|
||||
|
||||
#ifndef HAVE_ATTRIBUTE
|
||||
# undef __attribute__
|
||||
# define __attribute__(X) /*void*/
|
||||
# define __unused__ /*void*/
|
||||
#else
|
||||
# define __unused__ __attribute__((unused))
|
||||
#endif
|
||||
|
||||
/* Command-line switches */
|
||||
static int verbose_g = 0; /*lots of extra output */
|
||||
static int width_g = 80; /*output width in characters */
|
||||
|
@ -13,7 +13,7 @@
|
||||
*/
|
||||
|
||||
/* See H5private.h for how to include system headers */
|
||||
#include <H5config.h>
|
||||
#include <hdf5.h>
|
||||
#ifdef STDC_HEADERS
|
||||
# include <ctype.h>
|
||||
# include <errno.h>
|
||||
@ -32,7 +32,6 @@
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#include <hdf5.h>
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
#define NAMELEN 4096
|
||||
|
Loading…
x
Reference in New Issue
Block a user