summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1999-04-08 18:49:20 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1999-04-08 18:49:20 (GMT)
commit9bbc5746cc1be0021c678db4b3a7d2cca4fbb744 (patch)
treee264aa2eb8fd10c88f3c1e2414f96098e2338b74
parent6d36b8d9e25f4e4f46b47f84858ef9746af7262e (diff)
downloadhdf5-9bbc5746cc1be0021c678db4b3a7d2cca4fbb744.zip
hdf5-9bbc5746cc1be0021c678db4b3a7d2cca4fbb744.tar.gz
hdf5-9bbc5746cc1be0021c678db4b3a7d2cca4fbb744.tar.bz2
[svn-r1177] Changed HDmalloc to malloc to avoid the need of using H5private.h.
Removed the #ifndef MPIOTEST. MPIO tests should run all the time now that the test is more efficient.
-rw-r--r--testpar/testphdf5.c8
-rw-r--r--testpar/testphdf5.h1
2 files changed, 3 insertions, 6 deletions
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index dfa0ab8..8c2c5c5 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -112,7 +112,7 @@ parse_options(int argc, char **argv){
return(1);
} else if (**(argv) == '"') {
fileprefixlen = strlen(*(argv)+1)-1;
- fileprefix = (char *)HDmalloc(fileprefixlen+1);
+ fileprefix = (char *)malloc(fileprefixlen+1);
if (!fileprefix) {
printf("%s\n","memory allocation failed");
nerrors++;
@@ -121,7 +121,7 @@ parse_options(int argc, char **argv){
fileprefix = strncpy(fileprefix,*(argv)+1,fileprefixlen);
} else {
fileprefixlen = strlen(*(argv));
- fileprefix = (char *)HDmalloc(fileprefixlen+1);
+ fileprefix = (char *)malloc(fileprefixlen+1);
if (!fileprefix) {
printf("%s\n","memory allocation failed");
nerrors++;
@@ -183,7 +183,7 @@ main(int argc, char **argv)
if (fileprefix != NULL) {
for (i=0;i<3;i++) {
tmpptr = filenames[i];
- filenames[i] = (char *)HDmalloc ( fileprefixlen + strlen(tmpptr) + 2);
+ filenames[i] = (char *)malloc ( fileprefixlen + strlen(tmpptr) + 2);
if (!filenames[i]) {
printf("%s\n","memory allocation failed");
nerrors++;
@@ -197,10 +197,8 @@ main(int argc, char **argv)
}
if (dowrite){
-#ifndef MPIOTEST
MPI_BANNER("testing MPIO independent overlapping writes...");
test_mpio_overlap_writes(filenames);
-#endif
MPI_BANNER("testing dataset using split communicators...");
test_split_comm_access(filenames);
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index c12d8e9..e114305 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -5,7 +5,6 @@
#include <assert.h>
#include <hdf5.h>
-#include <H5private.h>
#include <mpi.h>
#include <mpio.h>