summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-11 21:09:42 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-11 21:09:42 (GMT)
commite5413fa795c68dda46c11aee4a3615f52377b0df (patch)
tree23ddfdc3e1aa280fe7093b079942b49c906660c6 /fortran
parent8e4bcb5fee17d87d07ab0672439ed391731c96b8 (diff)
downloadhdf5-e5413fa795c68dda46c11aee4a3615f52377b0df.zip
hdf5-e5413fa795c68dda46c11aee4a3615f52377b0df.tar.gz
hdf5-e5413fa795c68dda46c11aee4a3615f52377b0df.tar.bz2
[svn-r14202] Description:
Move H5Pregister our of old "compat v1.6" section and add it to the versioned symbols. Add simple regression test for H5Pregister1() Split H5P.c source file into H5P/H5Pint/H5Pdeprec files. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Pf.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index c3bd709..54f99d0 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -2278,7 +2278,7 @@ nh5pregisterc_c(hid_t_f *class, _fcd name, int_f *name_len, size_t_f *size, _fcd
/*----------------------------------------------------------------------------
* Name: h5pregister_c
- * Purpose: Call H5Pregister to registers a permanent property
+ * Purpose: Call H5Pregister2 to registers a permanent property
* Inputs: class - property list class identifier
* name - name of the new property
* name_len - length of the "name" buffer
@@ -2292,24 +2292,22 @@ nh5pregisterc_c(hid_t_f *class, _fcd name, int_f *name_len, size_t_f *size, _fcd
int_f
nh5pregister_c(hid_t_f *class, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
{
+ char* c_name = NULL;
int_f ret_value = -1;
- hid_t c_class;
- char* c_name;
- size_t c_size;
- c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
- if (c_name == NULL) goto DONE;
- c_size = (size_t)*size;
- c_class = (hid_t)*class;
+ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*name_len)))
+ goto DONE;
/*
- * Call H5Pregister function.
+ * Call H5Pregister2 function.
*/
- if( H5Pregister(c_class, c_name, c_size, value, NULL,NULL,NULL,NULL,NULL,NULL,NULL) <0) goto DONE;
+ if(H5Pregister2((hid_t)*class, c_name, (size_t)*size, value, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+ goto DONE;
ret_value = 0;
DONE:
- if(c_name != NULL) HDfree(c_name);
+ if(c_name != NULL)
+ HDfree(c_name);
return ret_value;
}