diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
commit | 6b45f5172ccb4311e0be9ae15da3758abb6b0e67 (patch) | |
tree | 5a7a112fe7a8a98c6fecb45b513789d15962eb3d /test/h5test.c | |
parent | 6562465a2c2a58cfbc2f47bf60bb538f7a783933 (diff) | |
download | hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.zip hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.gz hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.bz2 |
[svn-r11245] Purpose:
Code cleanup
Description:
Trim trailing whitespace, which is making 'diff'ing the two branches
difficult.
Solution:
Ran this script in each directory:
foreach f (*.[ch] *.cpp)
sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
end
Platforms tested:
FreeBSD 4.11 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'test/h5test.c')
-rw-r--r-- | test/h5test.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/test/h5test.c b/test/h5test.c index a68e69f..b1a6d2f 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -17,7 +17,7 @@ * Thursday, November 19, 1998 * * Purpose: Provides support functions for most of the hdf5 tests cases. - * + * */ #undef NDEBUG /*override -DNDEBUG */ @@ -211,7 +211,7 @@ void h5_reset(void) { char filename[1024]; - + HDfflush(stdout); HDfflush(stderr); H5close(); @@ -274,7 +274,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) char *ptr, last = '\0'; size_t i, j; hid_t driver = -1; - + if (!base_name || !fullname || size < 1) return NULL; @@ -290,7 +290,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) else if (H5FD_CORE == driver || H5FD_MULTI == driver) suffix = NULL; } - + /* Use different ones depending on parallel or serial driver used. */ if (H5P_DEFAULT != fapl && (H5FD_MPIO == driver || H5FD_FPHDF5 == driver)) { #ifdef H5_HAVE_PARALLEL @@ -301,7 +301,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) */ static int explained = 0; - prefix = (paraprefix ? paraprefix : getenv_all(MPI_COMM_WORLD, 0, "HDF5_PARAPREFIX")); + prefix = (paraprefix ? paraprefix : getenv_all(MPI_COMM_WORLD, 0, "HDF5_PARAPREFIX")); if (!prefix && !explained) { /* print hint by process 0 once. */ @@ -450,7 +450,7 @@ h5_fileaccess(void) const char *name; char s[1024]; hid_t fapl = -1; - + /* First use the environment variable, then the constant */ val = HDgetenv("HDF5_DRIVER"); #ifdef HDF5_DRIVER @@ -459,7 +459,7 @@ h5_fileaccess(void) if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) return -1; if (!val || !*val) return fapl; /*use default*/ - + HDstrncpy(s, val, sizeof s); s[sizeof(s)-1] = '\0'; if (NULL==(name=HDstrtok(s, " \t\n\r"))) return fapl; @@ -577,7 +577,7 @@ h5_show_hostname(void) /* try show the process or thread id in multiple processes cases*/ #ifdef H5_HAVE_PARALLEL - { + { int mpi_rank, mpi_initialized; MPI_Initialized(&mpi_initialized); @@ -599,18 +599,18 @@ h5_show_hostname(void) /* could not find a usable WinSock DLL */ return; } - + /* Confirm that the WinSock DLL supports 2.2.*/ /* Note that if the DLL supports versions greater */ /* than 2.2 in addition to 2.2, it will still return */ /* 2.2 in wVersion since that is the version we */ /* requested. */ - + if ( LOBYTE( wsaData.wVersion ) != 2 || HIBYTE( wsaData.wVersion ) != 2 ) { /* could not find a usable WinSock DLL */ WSACleanup( ); - return; + return; } #endif @@ -787,7 +787,7 @@ h5_get_file_size(const char *filename) * and allow easy replacement for environments which don't have stdin/stdout * available. (i.e. Windows & the Mac) */ -int +int print_func(const char *format, ...) { va_list arglist; @@ -799,7 +799,7 @@ print_func(const char *format, ...) return ret_value; } -#ifdef H5_HAVE_FILTER_SZIP +#ifdef H5_HAVE_FILTER_SZIP /*------------------------------------------------------------------------- @@ -812,36 +812,36 @@ print_func(const char *format, ...) * 0: only decode is enabled * -1: other * - * Programmer: + * Programmer: * * Modifications: * *------------------------------------------------------------------------- */ -int h5_szip_can_encode(void ) +int h5_szip_can_encode(void ) { herr_t status; unsigned int filter_config_flags; status =H5Zget_filter_info(H5Z_FILTER_SZIP, &filter_config_flags); - if ((filter_config_flags & + if ((filter_config_flags & (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == 0) { /* filter present but neither encode nor decode is supported (???) */ return -1; - } else if ((filter_config_flags & - (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == + } else if ((filter_config_flags & + (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_DECODE_ENABLED) { /* decoder only: read but not write */ return 0; - } else if ((filter_config_flags & - (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == + } else if ((filter_config_flags & + (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_ENCODE_ENABLED) { /* encoder only: write but not read (???) */ return -1; - } else if ((filter_config_flags & - (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == - (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) { + } else if ((filter_config_flags & + (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) == + (H5Z_FILTER_CONFIG_ENCODE_ENABLED|H5Z_FILTER_CONFIG_DECODE_ENABLED)) { return 1; } return(-1); @@ -879,12 +879,12 @@ char* getenv_all(MPI_Comm comm, int root, const char* name) int len = -1; static char* env = NULL; MPI_Status Status; - + assert(name); - - MPI_Comm_rank(comm, &nID); - /* The root task does the getenv call + MPI_Comm_rank(comm, &nID); + + /* The root task does the getenv call * and sends the result to the other tasks */ if(nID == root) { |