diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/misc/h5mkgrp.c | 10 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested.ls | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested_latest.ls | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested_mult.ls | 8 | ||||
| -rw-r--r-- | tools/testfiles/h5mkgrp_nested_mult_latest.ls | 8 |
5 files changed, 14 insertions, 20 deletions
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c index 048523a..f2fecbd 100644 --- a/tools/misc/h5mkgrp.c +++ b/tools/misc/h5mkgrp.c @@ -282,14 +282,8 @@ main(int argc, const char *argv[]) hid_t gid; /* Group ID */ /* Attempt to create a group */ - if((gid = H5Gcreate_expand(fid, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - error_msg(progname, "Could not create group\n"); - leave(EXIT_FAILURE); - } /* end if */ - - /* Link new group into group hierarchy */ - if(H5Llink(fid, params.groups[curr_group], gid, lcpl_id, H5P_DEFAULT) < 0) { - error_msg(progname, "Could not create link to group '%s'\n", params.groups[curr_group]); + if((gid = H5Gcreate2(fid, params.groups[curr_group], lcpl_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + error_msg(progname, "Could not create group '%s'\n", params.groups[curr_group]); leave(EXIT_FAILURE); } /* end if */ diff --git a/tools/testfiles/h5mkgrp_nested.ls b/tools/testfiles/h5mkgrp_nested.ls index 5f3d479..2b9fb25 100644 --- a/tools/testfiles/h5mkgrp_nested.ls +++ b/tools/testfiles/h5mkgrp_nested.ls @@ -3,8 +3,8 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested.h5' ############################# Opened "../testfiles/h5mkgrp_nested.h5" with sec2 driver. /one Group - Location: 1:1504 + Location: 1:800 Links: 1 /one/two Group - Location: 1:800 + Location: 1:1832 Links: 1 diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_latest.ls index a29489f..f0bab6f 100644 --- a/tools/testfiles/h5mkgrp_nested_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_latest.ls @@ -3,10 +3,10 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5' ############################# Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver. /one Group - Location: 1:342 + Location: 1:195 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /one/two Group - Location: 1:195 + Location: 1:342 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX diff --git a/tools/testfiles/h5mkgrp_nested_mult.ls b/tools/testfiles/h5mkgrp_nested_mult.ls index 99082b6..4fccd83 100644 --- a/tools/testfiles/h5mkgrp_nested_mult.ls +++ b/tools/testfiles/h5mkgrp_nested_mult.ls @@ -3,14 +3,14 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult.h5' ############################# Opened "../testfiles/h5mkgrp_nested_mult.h5" with sec2 driver. /one Group - Location: 1:1504 + Location: 1:800 Links: 1 /one/two Group - Location: 1:800 + Location: 1:1832 Links: 1 /three Group - Location: 1:3568 + Location: 1:2864 Links: 1 /three/four Group - Location: 1:2864 + Location: 1:3568 Links: 1 diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_latest.ls index d54b7f1..7835050 100644 --- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls +++ b/tools/testfiles/h5mkgrp_nested_mult_latest.ls @@ -3,18 +3,18 @@ Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5' ############################# Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver. /one Group - Location: 1:342 + Location: 1:195 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /one/two Group - Location: 1:195 + Location: 1:342 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /three Group - Location: 1:636 + Location: 1:489 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX /three/four Group - Location: 1:489 + Location: 1:636 Links: 1 Modified: XXXX-XX-XX XX:XX:XX XXX |