diff options
| author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2005-02-04 13:46:54 (GMT) |
|---|---|---|
| committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2005-02-04 13:46:54 (GMT) |
| commit | c4bf7bf62abeb3c843524375119e3b60335c823f (patch) | |
| tree | 45351f30f40ce4c02c8c38392bb6fa2458578bf6 /tools/h5import/h5import.c | |
| parent | c3f7be36ce73401d7a73bc520fefa90ff20d12c9 (diff) | |
| download | hdf5-c4bf7bf62abeb3c843524375119e3b60335c823f.zip hdf5-c4bf7bf62abeb3c843524375119e3b60335c823f.tar.gz hdf5-c4bf7bf62abeb3c843524375119e3b60335c823f.tar.bz2 | |
[svn-r9934] Purpose:
Bug
Description:
Refinement to bug fix #282
Solution:
Altered argument handling to do a better default.
Platforms tested:
verbena, shanti
Misc. update:
Diffstat (limited to 'tools/h5import/h5import.c')
| -rwxr-xr-x | tools/h5import/h5import.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index d07745d..b24aa84 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -1830,7 +1830,7 @@ setDefaultValues(struct Input *in, int count) HDstrcpy(in->path.group[0], temp); in->outputArchitecture = 0; /* NATIVE */ - in->outputByteOrder = 0; /* BE */ + in->outputByteOrder = -1; /* use default */ in->compressionType = 0; /* GZIP */ for (i=0; i<NUM_KEYS; i++) in->configOptionVector[i] = 0; @@ -1868,6 +1868,8 @@ createOutputDataType(struct Input *in) } switch(in->outputByteOrder) { + case -1: /* default */ + break; case 0: H5Tset_order (new_type,H5T_ORDER_BE); break; @@ -1884,6 +1886,7 @@ createOutputDataType(struct Input *in) case 8: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_I8BE); break; @@ -1897,6 +1900,7 @@ createOutputDataType(struct Input *in) case 16: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_I16BE); break; @@ -1910,6 +1914,7 @@ createOutputDataType(struct Input *in) case 32: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_I32BE); break; @@ -1923,6 +1928,7 @@ createOutputDataType(struct Input *in) case 64: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_I64BE); break; @@ -1954,6 +1960,8 @@ createOutputDataType(struct Input *in) } switch(in->outputByteOrder) { + case -1: /* DEFAULT */ + break; case 0: H5Tset_order (new_type,H5T_ORDER_BE); break; @@ -1974,6 +1982,7 @@ createOutputDataType(struct Input *in) case 32: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_IEEE_F32BE); break; @@ -1987,6 +1996,7 @@ createOutputDataType(struct Input *in) case 64: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_IEEE_F64BE); break; @@ -2026,6 +2036,8 @@ createOutputDataType(struct Input *in) } switch(in->outputByteOrder) { + case -1: /* Default */ + break; case 0: H5Tset_order (new_type,H5T_ORDER_BE); break; @@ -2042,6 +2054,7 @@ createOutputDataType(struct Input *in) case 8: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_U8BE); break; @@ -2055,6 +2068,7 @@ createOutputDataType(struct Input *in) case 16: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_U16BE); break; @@ -2068,6 +2082,7 @@ createOutputDataType(struct Input *in) case 32: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_U32BE); break; @@ -2081,6 +2096,7 @@ createOutputDataType(struct Input *in) case 64: switch(in->outputByteOrder) { + case -1: case 0: new_type = H5Tcopy (H5T_STD_U64BE); break; |