mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r15335] Fixed incorrect error message in H5Pset_fletcher32:

Browse Source 
"unable to add deflate filter to pipeline"
->
"unable to add fletcher32 filter to pipeline"

Tested: kagiso
This commit is contained in:
Neil Fortner 2008-07-08 11:19:52 -05:00
parent 40e8b8321e
commit 78d22e2c44
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5Pdcpl.c
View File

@ -2034,7 +2034,7 @@ H5Pset_fletcher32(hid_t plist_id)
if(H5P_get(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0) if(H5P_get(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline") HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
if(H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0) if(H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add deflate filter to pipeline") HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add fletcher32 filter to pipeline")
if(H5P_set(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0) if(H5P_set(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0)
HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline") HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")

20
tools/h5dump/h5dump.c
View File

@ -894,7 +894,7 @@ print_datatype(hid_t type,unsigned in_group)
is_vlstr = H5Tis_variable_str(tmp_type); is_vlstr = H5Tis_variable_str(tmp_type);
printf("H5T_STRING %s\n", dump_header_format->strblockbegin); printf("H5T_STRING %s\n", dump_header_format->strblockbegin);
indent += COL; /*indent += COL;*/
indentation(indent + COL); indentation(indent + COL);
if(is_vlstr) if(is_vlstr)
@ -983,8 +983,8 @@ print_datatype(hid_t type,unsigned in_group)
H5Tclose(str_type); H5Tclose(str_type);
H5Tclose(tmp_type); H5Tclose(tmp_type);
indent -= COL; /*indent -= COL;*/
indentation(indent + COL); indentation(indent/* + COL*/);
printf("%s", dump_header_format->strblockend); printf("%s", dump_header_format->strblockend);
break; break;
@ -1029,12 +1029,12 @@ print_datatype(hid_t type,unsigned in_group)
mtype = H5Tget_member_type(type, i); mtype = H5Tget_member_type(type, i);
indentation(indent + COL); indentation(indent + COL);
if (H5Tget_class(mtype) == H5T_COMPOUND) /*if (H5Tget_class(mtype) == H5T_COMPOUND)*/
indent += COL; indent += COL;
print_datatype(mtype,0); print_datatype(mtype,0);
if (H5Tget_class(mtype) == H5T_COMPOUND) /*if (H5Tget_class(mtype) == H5T_COMPOUND)*/
indent -= COL; indent -= COL;
printf(" \"%s\";\n", mname); printf(" \"%s\";\n", mname);
@ -1051,21 +1051,23 @@ print_datatype(hid_t type,unsigned in_group)
case H5T_ENUM: case H5T_ENUM:
printf("H5T_ENUM %s\n", dump_header_format->enumblockbegin); printf("H5T_ENUM %s\n", dump_header_format->enumblockbegin);
indent += COL; /*indent += COL;*/
indentation(indent + COL); indentation(indent + COL);
super = H5Tget_super(type); super = H5Tget_super(type);
print_datatype(super,0); print_datatype(super,0);
printf(";\n"); printf(";\n");
print_enum(type); print_enum(type);
indent -= COL; /*indent -= COL;*/
indentation(indent + COL); indentation(indent/* + COL*/);
printf("%s", dump_header_format->enumblockend); printf("%s", dump_header_format->enumblockend);
break; break;
case H5T_VLEN: case H5T_VLEN:
printf("H5T_VLEN %s ", dump_header_format->vlenblockbegin); printf("H5T_VLEN %s ", dump_header_format->vlenblockbegin);
super = H5Tget_super(type); super = H5Tget_super(type);
indent += COL;
print_datatype(super,0); print_datatype(super,0);
indent -= COL;
H5Tclose(super); H5Tclose(super);
/* Print closing */ /* Print closing */
@ -1090,7 +1092,9 @@ print_datatype(hid_t type,unsigned in_group)
printf(" "); printf(" ");
/* Print base type */ /* Print base type */
indent += COL;
print_datatype(super,0); print_datatype(super,0);
indent -= COL;
/* Close array base type */ /* Close array base type */
H5Tclose(super); H5Tclose(super);