summaryrefslogtreecommitdiffstats
path: root/tools/h5dump/h5dumpgentest.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-07-16 15:08:03 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-07-16 15:08:03 (GMT)
commitd06dd112915987516eb3f457c51db959b22a1f62 (patch)
tree10c91b380bccb9a1d354f0c56f47414ff4f0f66f /tools/h5dump/h5dumpgentest.c
parentfeb79ce8ea30f6cd3c85861b67f6f7fca772b3f7 (diff)
downloadhdf5-d06dd112915987516eb3f457c51db959b22a1f62.zip
hdf5-d06dd112915987516eb3f457c51db959b22a1f62.tar.gz
hdf5-d06dd112915987516eb3f457c51db959b22a1f62.tar.bz2
[svn-r22577] Windows compilers require declarations at top of routine.
Diffstat (limited to 'tools/h5dump/h5dumpgentest.c')
-rw-r--r--tools/h5dump/h5dumpgentest.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index fcbf8f1..63329f4 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -7369,22 +7369,21 @@ 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 );