Commit Graph

242 Commits

Author SHA1 Message Date
Allen Byrne
8194f34ef7 [svn-r24072] Merge trunk cmake changes to 1.8 branch.
Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.

Tested: local linux
2013-08-26 10:35:15 -05:00
Allen Byrne
5c84b51030 [svn-r24024] JAVA-1714: CMake packaging for macs improved
HDFFV-7989: h5dump any_path and help text grouping
Added cygwin-64 support

Merged from trunk, tested local linux
2013-08-19 11:51:32 -05:00
Allen Byrne
82642132ba [svn-r23995] Correct printf % handling 2013-08-12 15:54:14 -05:00
Allen Byrne
a003143ded [svn-r23992] HDFFV-8490 and H5UNJAM file handling. Merge from trunk.
Tested: local linux
2013-08-12 14:54:49 -05:00
Allen Byrne
f6ffaf1f69 [svn-r23898] HDFFV-8476: Add optional arg to -A for excluding attributes.
Merged from trunk.

Tested: local linux
2013-07-15 10:53:17 -05:00
Allen Byrne
b65c8842fd [svn-r23816] HDFFV-8455: moved h5dump before h5import
HDFFV-8465: corrected DTD reference path

Merged from trunk
Tested: local linux with cmake
2013-06-24 16:58:17 -05:00
Allen Byrne
1629fd1ee7 [svn-r23301] 2013-02-18 14:03:53 -05:00
Quincey Koziol
74d0aa11ad [svn-r22929] Description:
Bring r22921 from trunk to 1.8 branch:

    Review Coverity changes and bring them back to trunk. (QK & JK)

r20402:
Added #includes for h5tools.y or h5tools_utils.h as required to remedy implicit
function declarations which caused compiler warnings and coverity issues 703-4
and 708-11.

r20414:
This is related to the previous checkin r20399.  There were incorrect updates
which caused incorrect behavior when no file was given. Also possible segfault
when handling hyperslab options. Simplify the code changes.

r20449:
Description: Modified H5E_walk2_cb to check return value of H5I_object_verify.

r20450:
fixed coverity 813


Tested on:
    Mac OSX/64 10.8.2 (amazon) w/C++, FORTRAN, debug & threadsafe
    (too minor to require h5committest)
2012-10-19 12:54:22 -05:00
Quincey Koziol
14d87e20ff [svn-r22916] Description:
Bring r22915 from trunk to 1.8 branch:


    Bring Coverity changes back to trunk:

r20399:
Change parse_command_line to free hand structure on error and only "leave()" at end of main.

r20400:
Purpose: Fix coverity issue 592

Description: Added void cast to call to H5F_sfile_assert_num() in
H5F_term)interface().  There is no need to check the return value of this
function in general, and there would be nothing to do even if it did fail.

r20401:
Added free(src_sizes) and free(src_offset). --gh


Tested on:
    Mac OSX/64 10.8.2 (amazon) w/C++, FORTRAN, threadsafe
    (too minor for h5committest)
2012-10-17 14:31:44 -05:00
Allen Byrne
0bc6398ec4 [svn-r22721] HDFFV-8133: Add usage text to see Reference manual for compact subsetting. 2012-08-28 12:42:00 -05:00
Allen Byrne
c2491932d9 [svn-r22632] Merge from trunk revision 22631
tested: local linux
2012-08-06 09:18:55 -05:00
Allen Byrne
d9ba5c234c [svn-r22571] HDFFV-7784,-8095,7936 merge from trunk
Tested: local linux with cmake
2012-07-13 10:18:27 -05:00
Allen Byrne
5096b7d3ec [svn-r22551] Merge changes from Trunk revision 22550 for:
HDFFV-4206, -7953, -5930, -2687, -5942

Tested: local linux with cmake
2012-07-11 10:15:21 -05:00
Jonathan Kim
d6f8aa5c53 [svn-r22121] Purpose:
update for HDFFV-7523 JPSS: h5dump fails to open an attribute when using the -a option to specify an attribute with a slash in the name

Description:
  Added capability for "-a" option to show attributes containing "/"
  by using an escape character. For example, for a dataset "/dset"
  containing attribute "speed(m/h)", use "h5dump -a "/dset/speed(\/h)"
  to show the content of the attribute. 
  Merged from HDF5 trunk r22052, r22063, r22108

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE),  Windows (32-LE cmake), Cmake (jam)
2012-03-22 11:21:00 -05:00
Allen Byrne
19206f5687 [svn-r22088] HDFFV-7957(7958): Correct use of ERROR_STACK for h5dump and tools.
Tested: local linux after week in trunk
2012-03-19 09:26:04 -05:00
Allen Byrne
10179b33ee [svn-r22045] HDFFV-7957-7958:
Add tools error stack and check return from H5Dreference call.
Tested: trunk
2012-03-12 12:47:27 -05:00
Allen Byrne
6a2c50b10a [svn-r22025] Cleanup compiler warnings.
Add HD prefix to tools library based tests. Cleaned allocation/free in tests.

Tested: local linux/ h5committetest
2012-03-05 09:19:02 -05:00
Allen Byrne
68d93b7f4e [svn-r22013] HDFFV-7560:
Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest
2012-03-02 09:21:13 -05:00
Raymond Lu
9e56bed5e0 [svn-r21379] The tools used "%hhd" to print signed char. But VMS doesn't know it. So I used H5_VMS to have a different way ("%hd") to print it.
Tested on jam and VMS.
2011-09-13 10:55:19 -05:00
Allen Byrne
5f2eebe1b6 [svn-r21211] Correct location of xml schema files. JIRA HDFFV-7688 2011-08-10 15:51:44 -05:00
Quincey Koziol
a01f323d4c [svn-r20893] Description:
Bring r20885 from trunk to 1.8 branch:

r20340:
Address coverity issue 248.  Set freed pointer to NULL if realloc fails, then check for NULL before attempting to close array of handles stored in memory addressed by pointer.

r20341:
Added initialization udata.path = NULL; udata.visited = NULL; to prevent unintialized use after done: label.

Do C-style initialization AFTER all variable definitions.

r20342:
Fix valgrind error in H5DUMP-XML-tall.h5

r20343:
Addressed Coverity issue 591 - check the return value of H5S_SELECT_ITER_RELEASE.

r20344:
Added initialization udata.path = NULL; to prevent uninitialized used after done: label

r20347:
Purpose: Fix memory leak in overhead.c

Description: Fixed leak in test() in overhead.c where array "had" was never
freed.


r20348:
Addressed Coverity issue 705 - added prototype for resize_configs_are_equal to cache_common.h.

r20392:
Purpose: Fix coverity issues 1677 and 1678

Description: Added return value checking for 4 funciton calls in
H5tools_get_symlink_info().

r20394:
Purpose: Fix coverity issues 1674 and 1675

Description: Modified H5Epush2() and H5E_printf_stack() to keep track of whether
va_start() has been called, and to call va_end() at the end if so.

r20395:
Should be H5MM_calloc(count * sizeof(void*)). Fixed --gh 

r20396:
Should be H5MM_calloc(count * sizeof(void*)). Fixed. --gh

Tested on:
    Mac OSX/32 10.6.7 (amazon) w/debug & production
    (h5committested on branch)
2011-05-23 12:43:37 -05:00
Allen Byrne
a56750c9b5 [svn-r20802] Bring trunk revision 20798 to 1.8. Trunk changes passed overnight.
Tested: local linux
2011-05-12 12:23:43 -05:00
Allen Byrne
7706186b2f [svn-r20722] Refactor ext lib import and install.
Change case of tools subtests to not conflict with tools tests.
Add SOVERSION for linux
Remove PACKED BITS define/idef blocks

Bring r20721 from trunk
2011-05-04 14:46:33 -05:00
Raymond Lu
0efc913a67 [svn-r20624] Albert's test on bp reveals that the dumper had assertion failure when it tried to display empty attribute data. I added
a check for empty attribute in h5dump.c. I also added a check for empty dataset in tools/lib/h5tools.c.

Tested on jam, linew, and amani.
2011-04-25 11:38:56 -05:00
Quincey Koziol
d90f14295a [svn-r20540] Description:
Bring r20538 & r20539 from trunk to 1.8 branch:

	Update with new warning flags for gcc 4.6.x

	Bring Coverity changes back to trunk:

r20276:
Add recursive is vlen string function.
Cleanup resource leaks for issues: 200,202,329,688,811,812


r20277:
Check types and close by adding error section: issue 687


r20278:
Replaced implicit pointer conversion with (ocrt_info.new_obj != NULL).


r20280:
Addressed coverity issues 927-929 & 583.  The real issue is failure to check 
file name length -- at least at the H5FD interface level.  This needs more work, but at least I have dealt with the issue in H5FDfamily.c


r20337:
H5O_type_t  obj_type = H5O_TYPE_UNKNOWN;


r20338:
Added udata.name = NULL; to prevent potential uninitialized use after done: label.


r20339:
coverity issues: 686,828,1670-1673,1707-1711


Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
       FreeBSD/32 8.2 (loyalty) w/gcc4.6, in debug mode
       FreeBSD/64 8.2 (freedom) w/gcc4.6, in debug mode
       Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
               w/C++ & FORTRAN, w/threadsafe, in debug mode
       Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
               w/C++ & FORTRAN, in production mode
       Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
               w/szip filter, w/threadsafe, in production mode
       Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
       Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
2011-04-18 05:24:39 -05:00
Jonathan Kim
183aaba8fc [svn-r20385] Purpose:
Bug 2182 - h5ls and h5dump: update to use --enable-error-stack among tools, also update related descriptions

Description:
    Merged from HDF5 trunk r20378 and r20379
    Decided to use --enable-error-stack long option name only to 
    display error stack messages from HDF5 lib among tools.
    Updated to unify option name to '--enable-error-stack' for printing 
    HDF5 error stack messages for HDF5 tools. h5ls and h5dump for now.
    For h5ls, this replaces "-e/--errors" option, which is deprecated.
    For h5dump, remove -E from help page and RM , which was added by mistake
    before release1.8.7.
    Help page and RM got updated.
    Updated test case.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
2011-03-31 17:31:20 -05:00
Allen Byrne
7766d925a0 [svn-r20365] BZ1725: H5DUMP displays type of reference for H5T_REFERENCE
bring r20349 from trunk
2011-03-29 10:43:33 -05:00
Jonathan Kim
58ca19929f [svn-r20288] Purpose:
Fixed Bug 2216 - GMQS: h5diff - memory leak when compares vlen string in 
    dataset or attributes

Description:
    Merged from HDF5 trunk r20266, r20270 and r20285.
    Test for dataset : valgrind  --leak-check=full  ./h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/VLstring
    Test for attr : valgrind --leak-check=full ./h5diff h5diff_attr1.h5 h5diff_attr2.h5
    Both test cases are in testing script.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), Cmake - jam
2011-03-22 09:26:12 -05:00
Allen Byrne
a518bae9c0 [svn-r20248] Change name of new VLEN function from H5Tdetect_vlen_str to h5tools_detect_vlen_str to match other functions in tools lib.
Added back test for H5Tdetect_class of H5T_VLEN after each instance of above function to catch all VLEN types in h5dump.

bring back from trunk r20247

Tested: local linux
2011-03-14 16:05:44 -05:00
Allen Byrne
5fa726e066 [svn-r20212] Contary to ref man H5O_get_comment does not return null char in size.
Bring r20211 from trunk
2011-03-09 10:54:01 -05:00
Allen Byrne
e89007f621 [svn-r20182] BZ2048: Add -E --enable-error-stack option to h5dump.
Brought from trunk after one week of tests.

Tested: local linux
2011-03-04 08:34:18 -05:00
Allen Byrne
dd434c8d1f [svn-r20056] Correct comment handling and remove cut/paste oversights
Tested: local linux
2011-02-07 14:22:06 -05:00
Allen Byrne
229e13fece [svn-r20045] Fix bz2127 by dynamically allocating storgae for comments.
Bring 20044 from trunk

Tested: local linux
2011-02-04 15:36:24 -05:00
Allen Byrne
b07be6d521 [svn-r19916] Add hh modifier to signed char printf format string. Added h5dump test to verify that signed/unsigned datasets print correctly.
Solves problem on heiwa with Signed char of 8 bits
Tested: local linux, heiwa
2011-01-05 13:58:21 -05:00
Allen Byrne
85d3499528 [svn-r19912] Add instruction to get native type before checking the type against H5T_NATIVE_xxxx
Tested: heiwa where it had failed
2011-01-05 11:22:59 -05:00
Allen Byrne
f5f8ea0729 [svn-r19903] Need to check if the length of mask is equal to the size of the mask and skip the shift.
Tested: local linux
2011-01-04 09:53:27 -05:00
Allen Byrne
22ad8ccadd [svn-r19902] Use an unsigned long long variable to generate the mask instead of a constant.
Tested: windows where it had failed.
2011-01-03 12:28:13 -05:00
Allen Byrne
a863723db8 [svn-r19897] Extend packed bits and testing to 64 bit integers.
Tested: local Linux
2010-12-30 09:00:48 -05:00
Raymond Lu
bb87e6bac6 [svn-r19479] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19466.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with 
the 1.8 library to compile.

Tested on jam - backing out, simple.
2010-09-27 12:53:37 -05:00
Raymond Lu
d688fc55a9 [svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
2010-09-20 16:57:57 -05:00
Quincey Koziol
525caddd9e [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)
2010-08-19 16:16:28 -05:00
Quincey Koziol
ae32ba97fd [svn-r19182] Description:
Bring r19179 from trunk to 1.8 branch:

Bring changes from Coverity branch back to trunk:

r19079 & 19080:
[BZ1942]  h5dump -u to generate XML, it does not respect the -m option

xml version of dump_data function didn't check for use of fp_format variable.

Added new test expected file for committed bug 1942

r19103, 19104 & 19105:
[BZ1821] h5repack -v did not display correct output for a selected compression. Needed new test for comparing output of -v option.

Added new test file for solution to BZ1821

BZ1821 - Bring test changes from the shell script actually used.

Tested on:
    Mac OS X/32 10.6.4 (amazon) debug & production
    (h5committested on branch)
2010-08-06 12:51:53 -05:00
Albert Cheng
fdaeddcdcd [svn-r18892] Improvment:
Revised the online help page of h5dump to explain the packed bits feature and
added an example too.

Tested: h5committest plus jam tested with --disable-h5dump-packedbits.
2010-05-25 15:29:36 -05:00
Albert Cheng
174cc7b19e [svn-r18821] Packed bits codes tidy up. Removed codes that are not needed
any more. Changed algorithm of creating mask which now sits
at the least significant bits. Display data by down shift
first and then mask it for display. Changed the variable
names to reflect the new purpose better.

Tested: AlbertPax (linux)
2010-05-15 00:40:00 -05:00
Albert Cheng
a44c942518 [svn-r18796] Enhancement 1853:
Install packed-bits feature for h5dump.

tools/h5dump/h5dump.c:
    Added lots of error checking into parse_mask_list() to catch and
    flagged packed-bits argument errors. For now, the packed bits
    are limited to 1 byte (8 bits) range.

tools/h5dump/testh5dump.sh.in
    Added 10 new packed-bits test to verify normal operation and argument
    error detection.

tools/lib/h5tools.h:
tools/lib/h5tools_str.c:
tools/lib/h5tools.c:
    Only name changes of the packed-bit global variables to reflect
    the nature of the variable better, IMO.

Tested: albertPax (linux)
------------------------------------------------------------------------
2010-05-13 16:42:16 -05:00
Allen Byrne
05d75af8b8 [svn-r18757] Enable tools lib to be built as a dll on windows. Added two get/set functions for progname and d_status.
Also add windows import/export declarations to functions.
Updated windows - H5pubconf.h for packed bits function

Tested:
   Windows, linux
2010-05-11 12:49:41 -05:00
Albert Cheng
7c16aec7e1 [svn-r18743] enhancement 1853:
Install packed-bits feature for h5dump.

Allen has installed the feature in the NPOESS feature branch.
I ported it back to the v1.8 branch for v1.8.5 release.

tools/h5dump/testh5dump.sh.in:
    Added tests for the packed-bits feature.
tools/h5dump/h5dump.c
tools/h5dump/h5dump.h
    Added code to parse and handled the packed-bits request.
tools/lib/h5tools.h
tools/lib/h5tools_str.c
tools/lib/h5tools.c
    Added code to print packed-bits.
tools/testfiles/tpackedbits2.ddl
tools/testfiles/tnofilename-with-packed-bits.ddl
tools/testfiles/tpackedbits.ddl
    Expected output files for packed-bits feature.

Tested:
    h5committested the NPOESS branch.
    Tested in the linux VM machine in my Dove.
2010-05-07 15:56:54 -05:00
Quincey Koziol
e51e5cea3f [svn-r18303] Description:
Bring r18302 from trunk to 1.8 branch:

    Tweak allocation of attribute tables created from densely stored attributes
to allow for better cleanup on errors (like when the type of corruption from
Bz#1755 is encountered).

    Also, add some code to h5dump to display an error message when the
attribute iteration for an object fails.

Tested on:
    Mac OS X/32 10.6.2 (amazon) w/debug & production
    (h5committested on trunk)
2010-02-19 23:36:27 -05:00
Quincey Koziol
fa1f33701d [svn-r18198] Description:
Trim trailing whitespace from source code files, with following command:

find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.f90" \) -print |xargs -n 1 sed -i "" 's/[[:blank:]]*$//'

Tested on:
    None - eyeballed only
2010-01-29 23:33:04 -05:00
Quincey Koziol
346d487d16 [svn-r18160] Description:
Bring r18159 from trunk to 1.8 branch:

    Bring Coverity fixes from 1/22/10 session to trunk:

r18137:
219: Initialized hid_t to -1 and added close to error block.
189-191: Initialized line to NULL and added free line, and close fp to error block.

r18138:
19: Moved code block for printing that the number of enums is empty to the error block. (Would never have been executed otherwise)

r18139:
Fix coverity item 58.  Moved code related to displaying the parent of a repeated
group to the else(isRoot) section, as the root group has no parent.

r18140:
218: Initialized ret_value variable to -1. Because of throw Exception in default case of switch, the coverity problem would not have executed anyway. Good pratice is to initialize variables.

r18141:
Fix coverity item 92.  Added code to H5E_register_class to free cls in case of
an error.

r18142:
Fix coverity item 91.  Added code to H5E_create_msg to free msg in case of an
error.

r18143:
fixed issue 14,
took away "if" and used #ifndef_xxx.

r18144:
Fix coverity item 110.   Added code to H5Eget_minor to free msg_str in case of
an error.

r18145:
fixed coverity #18 removed "aligned", it is always NULL.

r18146:
Fix coverity item 109.   Added code to H5Eget_major to free msg_str in case of
an error.

r18147:
Fixed coverity #81 and #82, Check for bad pointer(s), but can't issue error, just leave

r18148:
Fix coverity item 97.   Added code to H5FD_fapl_open to free copied_driver_info
in case of an error.

r18149:
Fix coverity item 96.   Added code to H5FD_dxpl_open to free copied_driver_info
in case of an error.

r18150:
Fix Coverity issue #29: Protected cache_ptr dereferences with "if(pass)"
block

r18151:
Fix coverity item 93.   Added code to H5FL_fac_init to free factory and new_node
in case of an error.

r18152:
Fix coverity items 98 and 99.   Added code free allocated space in case of
error.

r18155:
124: Freed head pointer before jumping to done. There was no error handling block and normal exit used same path out.
120-123: Freed list of lists in error handling block.

r18156:
Fix coverity issues 179, 180, 181, 182, 183, 184, 186, 320, 407.  These were resource leak issues where allocated memory was not freed, generally in the case of tests that failed.

Tested on:
   Mac OS X/32 10.6.2 (amazon) debug & production
2010-01-23 02:11:57 -05:00