diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-01-31 20:51:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-01-31 20:51:23 (GMT) |
| commit | 415aa7e257df7fc9ba85117ee8f66e5ef6dcf0df (patch) | |
| tree | 5a280320e6d00fb8ce18adf56646d77931ffa3df | |
| parent | b84234d23ce39960a69430f584959570570bf9ed (diff) | |
| download | hdf5-415aa7e257df7fc9ba85117ee8f66e5ef6dcf0df.zip hdf5-415aa7e257df7fc9ba85117ee8f66e5ef6dcf0df.tar.gz hdf5-415aa7e257df7fc9ba85117ee8f66e5ef6dcf0df.tar.bz2 | |
[svn-r23216] Add newline for special case of only raw data to stdout
| -rw-r--r-- | tools/lib/h5tools.c | 9 | ||||
| -rw-r--r-- | tools/testfiles/tnoattrddl.ddl | 2 | ||||
| -rw-r--r-- | tools/testfiles/tnoddl.ddl | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 254c8b4..66c0e64 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -157,6 +157,9 @@ h5tools_close(void) H5E_auto2_t tools_func; void *tools_edata; if (h5tools_init_g) { + if((rawoutstream == NULL) && rawdatastream && (rawdatastream == stdout)) + HDfprintf(rawdatastream, "\n"); + H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata); if(tools_func!=NULL) H5Eprint2(H5tools_ERR_STACK_g, rawerrorstream); @@ -1237,7 +1240,8 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t break; case H5T_REFERENCE: { - if (H5Tequal(tid, H5T_STD_REF_DSETREG)) { + if (size == H5R_DSET_REG_REF_BUF_SIZE) { + /* if (H5Tequal(tid, H5T_STD_REF_DSETREG)) */ if (region_output) { /* region data */ hid_t region_id, region_space; @@ -1261,7 +1265,8 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t } } /* end if (region_output... */ } - else if (H5Tequal(tid, H5T_STD_REF_OBJ)) { + else if (size == H5R_OBJ_REF_BUF_SIZE) { + /* if (H5Tequal(tid, H5T_STD_REF_OBJ)) */ ; } } diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/testfiles/tnoattrddl.ddl index c68877d..f7326d0 100644 --- a/tools/testfiles/tnoattrddl.ddl +++ b/tools/testfiles/tnoattrddl.ddl @@ -4,4 +4,4 @@ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 100 - "string attribute"
\ No newline at end of file + "string attribute" diff --git a/tools/testfiles/tnoddl.ddl b/tools/testfiles/tnoddl.ddl index dc19888..5238777 100644 --- a/tools/testfiles/tnoddl.ddl +++ b/tools/testfiles/tnoddl.ddl @@ -399,4 +399,4 @@ 4, 4.0001, 4.0002, 4.0003, 4.0004, 4.0005, 4.0006, 4.0007, 5, 5.0001, 5.0002, 5.0003, 5.0004, 5.0005, 5.0006, 5.0007, 6, 6.0001, 6.0002, 6.0003, 6.0004, 6.0005, 6.0006, 6.0007, - 7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007
\ No newline at end of file + 7, 7.0001, 7.0002, 7.0003, 7.0004, 7.0005, 7.0006, 7.0007 |