mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23241] Fix for: HDFFV-7596 H5DSget_scale returns size that includes NULL termination and H5DSget_label returns size

Browse Source 
Updated tests.

Tested: jam( gnu, intel)
This commit is contained in:
Scot Breitenfeld 2013-02-10 21:06:01 -05:00
parent 944f0399ac
commit 871b69723e
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hl/fortran/src/H5DSfc.c
View File

@ -331,12 +331,8 @@ nh5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
/*
* Convert C name to FORTRAN and place it in the given buffer
*/
if(size_c != 0) {
HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
*size = (size_t_f)size_c-1; /* (-1) because we don't include the NULL ending in the length*/
} else {
*size = (size_t_f)size_c; /* if NULL then no name was found */
}
HD5packFstring(c_scale_name, _fcdtocp(name), (size_t)*size);
*size = (size_t_f)size_c;
done:
if(c_scale_name) HDfree(c_scale_name);

4
hl/src/H5DS.c
View File

@ -1779,6 +1779,8 @@ out:
* Comments:
*
* Modifications:
* The size of the name returned should not include the NULL termination
* in its value so as to be consistent with other HDF5 APIs.
*
*-------------------------------------------------------------------------
*/
@ -1875,7 +1877,7 @@ ssize_t H5DSget_scale_name(hid_t did,
buf=NULL;
}
return (ssize_t) nbytes;
return (ssize_t) MAX(0,nbytes-1);
/* error zone */
out:

8
hl/test/test_ds.c
View File

@ -1127,9 +1127,9 @@ herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *sc
if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
if(H5DSis_attached(did, dsid, idx) == 1) {
if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) {
name_out = (char*)HDmalloc(name_len * sizeof (char));
name_out = (char*)HDmalloc((name_len+1) * sizeof (char));
if(name_out != NULL) {
if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) >= 0) {
if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) >= 0) {
if(HDstrcmp(scalename,name_out)==0) {
ret_value = SUCCEED;
}
@ -3232,12 +3232,12 @@ static int test_simple(void)
goto out;
/* allocate a buffer */
name_out = (char*)HDmalloc(name_len * sizeof (char));
name_out = (char*)HDmalloc((name_len+1) * sizeof (char));
if(name_out == NULL)
goto out;
/* get the scale name using this buffer */
if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) < 0)
if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) < 0)
goto out;
if(HDstrcmp("Latitude set 0",name_out)!=0)