diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 21:16:28 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 21:16:28 (GMT) |
commit | 525caddd9e0460b2f39d043f04dabc7ab6a1bf3a (patch) | |
tree | 176f2be3724d8160e67de97df457988a27aa2257 /tools/h5repack/h5repack_opttable.c | |
parent | d221d97f992d66540d39b0dfdca80b37849a7dd6 (diff) | |
download | hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.zip hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.tar.gz hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.tar.bz2 |
[svn-r19254] Description:
Bring r19252 & 19253 from trunk to 1.8 branch:
Bring Coverity changes from branch to trunk:
r19161:
Fixed the part for matching the subset info with dataset
r19189:
BZ1646: h5dump does not check number of dimensions for subsetting parameters against the dataset
Changed subset_t structure from holding hsize_t pointers to holding new subset_d pointers, which hold the original hsize_t pointer + len. this len is then checked against dataset ndims in the handle_dataset function of h5dump.
Changed all references to use new data structure.
Added tests for each subset parameter.
r19190:
Added new h5dump ddl files
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug & production
(h5committested on Coverity branch)
Diffstat (limited to 'tools/h5repack/h5repack_opttable.c')
-rw-r--r-- | tools/h5repack/h5repack_opttable.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c index d1cb97a..50f97bd 100644 --- a/tools/h5repack/h5repack_opttable.c +++ b/tools/h5repack/h5repack_opttable.c @@ -65,7 +65,7 @@ static void aux_tblinsert_filter(pack_opttbl_t *table, } else { - error_msg(h5tools_getprogname(), "cannot insert the filter in this object.\ + error_msg("cannot insert the filter in this object.\ Maximum capacity exceeded\n"); } } @@ -124,7 +124,7 @@ static int aux_inctable(pack_opttbl_t *table, int n_objs ) table->size += n_objs; table->objs = (pack_info_t*)realloc(table->objs, table->size * sizeof(pack_info_t)); if (table->objs==NULL) { - error_msg(h5tools_getprogname(), "not enough memory for options table\n"); + error_msg("not enough memory for options table\n"); return -1; } for (i = table->nelems; i < table->size; i++) @@ -151,7 +151,7 @@ int options_table_init( pack_opttbl_t **tbl ) if(NULL == (table = (pack_opttbl_t *)malloc(sizeof(pack_opttbl_t)))) { - error_msg(h5tools_getprogname(), "not enough memory for options table\n"); + error_msg("not enough memory for options table\n"); return -1; } @@ -159,7 +159,7 @@ int options_table_init( pack_opttbl_t **tbl ) table->nelems = 0; if(NULL == (table->objs = (pack_info_t*)malloc(table->size * sizeof(pack_info_t)))) { - error_msg(h5tools_getprogname(), "not enough memory for options table\n"); + error_msg("not enough memory for options table\n"); free(table); return -1; } @@ -230,7 +230,7 @@ int options_add_layout( obj_list_t *obj_list, /* already chunk info inserted for this one; exit */ if (table->objs[i].chunk.rank>0) { - error_msg(h5tools_getprogname(), "chunk information already inserted for <%s>\n",obj_list[j].obj); + error_msg("chunk information already inserted for <%s>\n",obj_list[j].obj); exit(EXIT_FAILURE); } /* insert the layout info */ |