summaryrefslogtreecommitdiffstats
path: root/perform
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-08-18 00:31:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-08-18 00:31:01 (GMT)
commit6e58f671ec62120246a94101a80a47259ffb96c3 (patch)
tree204ba14aa8e2fad6bb78ef8128c3f98c48e26f39 /perform
parentb5a5441e7c5eb09cb53677326c3e84f80acdf108 (diff)
downloadhdf5-6e58f671ec62120246a94101a80a47259ffb96c3.zip
hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.gz
hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.bz2
[svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch: Clean up compiler warnings Tested on: Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'perform')
-rw-r--r--perform/sio_engine.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/perform/sio_engine.c b/perform/sio_engine.c
index 541a9b0..4b037df 100644
--- a/perform/sio_engine.c
+++ b/perform/sio_engine.c
@@ -1103,25 +1103,25 @@ done:
hid_t
set_vfd(parameters *param)
{
- hid_t fapl = -1;
+ hid_t my_fapl = -1;
vfdtype vfd;
vfd = param->vfd;
- if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) return -1;
+ if ((my_fapl=H5Pcreate(H5P_FILE_ACCESS))<0) return -1;
if (vfd == sec2) {
/* Unix read() and write() system calls */
- if (H5Pset_fapl_sec2(fapl)<0) return -1;
+ if (H5Pset_fapl_sec2(my_fapl)<0) return -1;
} else if (vfd == stdio) {
/* Standard C fread() and fwrite() system calls */
- if (H5Pset_fapl_stdio(fapl)<0) return -1;
+ if (H5Pset_fapl_stdio(my_fapl)<0) return -1;
} else if (vfd == core) {
/* In-core temporary file with 1MB increment */
- if (H5Pset_fapl_core(fapl, (size_t)1024*1024, TRUE)<0) return -1;
+ if (H5Pset_fapl_core(my_fapl, (size_t)1024*1024, TRUE)<0) return -1;
} else if (vfd == split) {
/* Split meta data and raw data each using default driver */
- if (H5Pset_fapl_split(fapl,
+ if (H5Pset_fapl_split(my_fapl,
"-m.h5", H5P_DEFAULT,
"-r.h5", H5P_DEFAULT)<0)
return -1;
@@ -1147,7 +1147,7 @@ set_vfd(parameters *param)
memb_addr[mt] = MAX(mt-1,0)*(HADDR_MAX/10);
}
- if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name,
+ if (H5Pset_fapl_multi(my_fapl, memb_map, memb_fapl, memb_name,
memb_addr, FALSE)<0) {
return -1;
}
@@ -1157,20 +1157,20 @@ set_vfd(parameters *param)
/* Family of files, each 1MB and using the default driver */
/* if ((val=HDstrtok(NULL, " \t\n\r")))
fam_size = (hsize_t)(HDstrtod(val, NULL) * 1024*1024); */
- if (H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0)
+ if (H5Pset_fapl_family(my_fapl, fam_size, H5P_DEFAULT)<0)
return -1;
} else if (vfd == direct) {
#ifdef H5_HAVE_DIRECT
/* Linux direct read() and write() system calls. Set memory boundary, file block size,
* and copy buffer size to the default values. */
- if (H5Pset_fapl_direct(fapl, 1024, 4096, 8*4096)<0) return -1;
+ if (H5Pset_fapl_direct(my_fapl, 1024, 4096, 8*4096)<0) return -1;
#endif
} else {
/* Unknown driver */
return -1;
}
- return fapl;
+ return my_fapl;
}
/*