summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-07-16 15:08:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-07-16 15:08:25 (GMT)
commite89ecb8b21d6f76d463060500c2d9ff374f6f9e0 (patch)
tree1f691210a793594b19b3cea359555c70cd3d9a94 /tools/h5dump
parent8d05b733b91f4d74d191b5fd7138024e9546c66e (diff)
downloadhdf5-e89ecb8b21d6f76d463060500c2d9ff374f6f9e0.zip
hdf5-e89ecb8b21d6f76d463060500c2d9ff374f6f9e0.tar.gz
hdf5-e89ecb8b21d6f76d463060500c2d9ff374f6f9e0.tar.bz2
[svn-r22578] Windows compilers require declarations at top of routine.
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/h5dumpgentest.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index c12be7a..27b648a 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -7333,22 +7333,19 @@ gent_charsets(void)
const char *utf8_p_;
} CharSetInfo;
- sid = H5Screate_simple( 1, dim, NULL );
- fid = H5Fcreate( FILE68, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-
hid_t charset_dtid = H5Tcreate( H5T_COMPOUND, sizeof( CharSetInfo ) );
-
hid_t ascii_dtid = H5Tcreate( H5T_STRING, H5T_VARIABLE );
+ hid_t utf8_dtid = H5Tcreate( H5T_STRING, H5T_VARIABLE );
+ const char * writeData[] = { "ascii", "utf8", };
+
+ sid = H5Screate_simple( 1, dim, NULL );
+ fid = H5Fcreate( FILE68, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
status = H5Tset_cset( ascii_dtid, H5T_CSET_ASCII );
H5Tinsert( charset_dtid, "ascii", HOFFSET(CharSetInfo, ascii_p_ ), ascii_dtid );
-
- hid_t utf8_dtid = H5Tcreate( H5T_STRING, H5T_VARIABLE );
status = H5Tset_cset( utf8_dtid, H5T_CSET_UTF8 );
H5Tinsert( charset_dtid, "utf8", HOFFSET( CharSetInfo, utf8_p_ ), utf8_dtid );
did = H5Dcreate2( fid, "CharSets", charset_dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
-
- const char * writeData[] = { "ascii", "utf8", };
status = H5Dwrite( did, charset_dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, writeData );
H5Tclose( charset_dtid );