diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-05-18 19:37:02 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-05-18 19:37:02 (GMT) |
commit | 7648fb25ad05e9c523842b6afdcad8abd0ae4305 (patch) | |
tree | 03753be12155e164cc2b1a36618af53b08731bbf /tools/misc/h5mkgrp.c | |
parent | 6cecb1352220daa248bed247ffd613c92c6c9f03 (diff) | |
parent | 7557384b9b60c2561a2eb5b08027f59737cb49c7 (diff) | |
download | hdf5-7648fb25ad05e9c523842b6afdcad8abd0ae4305.zip hdf5-7648fb25ad05e9c523842b6afdcad8abd0ae4305.tar.gz hdf5-7648fb25ad05e9c523842b6afdcad8abd0ae4305.tar.bz2 |
Merge pull request #524 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '7557384b9b60c2561a2eb5b08027f59737cb49c7':
Correct name of reference file to be copied
HDFFV-10186 new testfile
Correct statement order
HDFFV-9055 add new test file
Tools merge from develop-1.10
Diffstat (limited to 'tools/misc/h5mkgrp.c')
-rw-r--r-- | tools/misc/h5mkgrp.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c index 4ec923a..597b6b3 100644 --- a/tools/misc/h5mkgrp.c +++ b/tools/misc/h5mkgrp.c @@ -5,12 +5,10 @@ * * * This file is part of HDF5. The full HDF5 copyright notice, including * * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -63,7 +61,7 @@ param_t params; /* Command line parameter settings */ static void leave(int ret) { - int curr_group; + size_t curr_group; if (params.fname) HDfree (params.fname); @@ -180,8 +178,8 @@ parse_command_line(int argc, const char *argv[], param_t *parms) } /* end if */ /* Allocate space for the group name pointers */ - parms->ngroups = (argc - opt_ind); - parms->groups = HDmalloc(parms->ngroups * sizeof(char *)); + parms->ngroups = (size_t)(argc - opt_ind); + parms->groups = (char **)HDmalloc(parms->ngroups * sizeof(char *)); /* Retrieve the group names */ curr_group = 0; |