Commit Graph

2163 Commits

Author SHA1 Message Date
Larry Knox
497234f8e3 [svn-r24201] Merged changes from trunk revisions 23431, 23527 and 24077.
Switched default to link to shared lib files when HDF5 is configure with --disable-static.
This addressed HDFFV-8141, h5cc failed because it defaulted to link to lib*.a files which
aren't built with --disable-static.
-help message also updated.

Tested in trunk.
Merged code tested with h5committest.
2013-09-25 17:04:18 -05:00
Quincey Koziol
38e0563a6e [svn-r24112] Description:
Bring r24101 & 24111 from trunk to 1.8 branch:

r24101:
=======
Description:
    Clean up warnings, enable new compiler warning flag(s) and bring back
changes from Coverity branch:

    r20813:
        Remove the dead code as listed for coverity bug #1722. h5committested.

    r20814:
        Issue 69: Check return value and throw error if negative return. Also free datatype id on error

    r20815:
        Use HDstrncpy. --gh

    r20816:
        Replaced one last HDstrcat call with HDstrncat to resolve coverity issue 832.

    r20817:
        Use HDstrncpy and HDstrncat. --gh

    r20818:
        Purpose: Fix valgrind issues with h5jam

        Description:
        Modified h5jam to free strings strdup'd in parse_command_line before exit. Note
        that they may still not be freed in case of error, due to the widespread use of
        exit().

    r20819:
        Issue 80: change loop to use int as loop index.

    r20820:
        Maintenance: Fixed the bug found by coverity CID 788
        There were two problems with this function:
            1) it tried to unnecessary free NULL pointer
        2) it tried to allocate c_name buffer that is done by H5Pget_class_name

r24111:
=======
Description:
   Restrict GCC diagnostic pragmas to only gcc 4.6+


Tested on:
    Mac OSX 10.8.4 (amazon) w/gcc 4.8.1, C++ & FORTRAN
    (too minor to require h5committest)
2013-09-06 14:09:07 -05:00
Allen Byrne
ad7d03103d [svn-r24108] Remove file from the future. 2013-09-06 12:57:57 -05:00
Allen Byrne
35b22a13a8 [svn-r24106] Add help text tests for h5dump and h5repack to the linux scripts. HDFFV-8498 merge from trunk.
Tested: local linux - cmake and autotools
2013-09-06 12:28:26 -05:00
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
Quincey Koziol
a33303139e [svn-r24032] Description:
Bring r24030 from trunk to 1.8 branch:

    Clean up more compiler warnings.

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/gcc, C++ & FORTRAN
    (too minor to require h5committest)
2013-08-19 19:55:47 -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
Quincey Koziol
6e58f671ec [svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch:

    Clean up compiler warnings

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-17 19:31:01 -05:00
Vailin Choi
dd327986b9 [svn-r24014] This checkin is a merge of the checkin for h5stat to the trunk (rev #23975-23977) + an additional bug fix--
A) Fix for HDFFV-1238:
   --Add 3 new options to allow users in setting threshold for small groups/datasets/attributes (tools/h5stat/h5stat.c)
   --Generate new test file for testing the new options (tools/h5stat/h5stat_gentest.c)
   --Add tests for the new options (tools/h5stat/testh5stat.sh.in)
   --Update expected output files (tools/h5stat/testfiles/*.ddl)
B) Fix a bug in determining maximum dimension size for 1-D dataset in dataset_stats() (tools/h5stat/h5stat.c)
C) Fix a bug when using opt_arg that is NULL for the new options.
2013-08-16 14:20:34 -05:00
Quincey Koziol
efb39881a0 [svn-r24012] Description:
Bring r24011 from trunk to 1.8 branch:

    Clean up a few warnings

Tested on:
    Mac OSX 10.8.4 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-08-15 08:27:24 -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
Larry Knox
cdef147e6e [svn-r23965] Corrected "continuous" layout to "contiguous" in h5repack -h output and comment.
Jira issue HDFFV-8493.

No test - text only change.
2013-08-02 16:31:01 -05:00
Albert Cheng
d34ec5c94c [svn-r23921] Bug fix: HDFFV-8392
[folded fix to v18 branch.]
tools/h5diff/testh5diff.sh is run in every "make check", even after it
has passed in the previous run.
The error was in the previous change made to Makefile.am
when testh5diff.sh.in was created.  The mistake was in the
SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh
$(srcdir)/testh5diff.sh no longer existed. It is now generated in the
current built directory from $(srcdir)/testh5diff.sh.in (which configure
takes care of).

I updated the dependance to
SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh
and that fixes the error.

Reviewed: HDF5-149

Tested: h5committested.
2013-07-19 16:39:21 -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
Raymond Lu
dbee66c457 [svn-r23885] Issue VMS-3: OpenVMS needs special printing format "%hd" for 1-byte integer. I used the macro H5_VMS
to choose the correct format in the initialization of ls_dataformat.

Tested with h5committest.
2013-07-10 16:01:24 -05:00
Mohamad Chaarawi
38bdc241ed [svn-r23868] bring r 23862 from trunk:
Change printfs in perform output and h5dump to prevent overflow.
This fixes: https://jira.hdfgroup.uiuc.edu/browse/HDFFV-8450
2013-07-08 09:04:23 -05:00
Raymond Lu
562892e538 [svn-r23855] I added macro condition for OpenVMS in the hard-coded initialization of h5tools_dataformat.
Tested on jam and OpenVMS - simple change.
2013-07-01 18:17:24 -05:00
Albert Cheng
1bd478b1dc [svn-r23826] Bug HDFFV-8469: C++ comments in C code.
Found and removed two more "//" comments.

Tested: in Koala by
$ env CFLAGS="-ansi" ../hdf5/bin/buildhdf5 -fortran -cxx -config # enable fortran and cxx, configure only
$ make AM_CFLAGS=-ansi # compile all source file by setting HDF5 build CFLAGS as "-ansi" only
2013-06-26 01:26:13 -05:00
Allen Byrne
d5ce236cc7 [svn-r23820] Change name of generated file in test to use the macro based removal line.
Tested: local linux
2013-06-25 09:06:44 -05:00
Allen Byrne
c103e99ca8 [svn-r23818] The forgotten testfile changes 2013-06-25 08:22:24 -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
858668f900 [svn-r23797] remove commented line with c++ style 2013-06-20 10:06:30 -05:00
Allen Byrne
e41f1a44b8 [svn-r23771] HDFFV-8434,-8437,-8445,-8447,-8461: Merge changes from Trunk.
Tested: local linux
2013-06-14 09:24:27 -05:00
Quincey Koziol
afc68537cd [svn-r23696] Description:
Bring r23695 from trunk to 1.8 branch:

Clean up warnings in H5Tconv.c (down to _only_ 9000 lines of output now!)

Merge changes from Coverity branch back to trunk:

r20684:
Fix for coverity bug #1721 which was due to the fix for coverity bug #943.

r20685:
Use HDstrncpy. --gh

r20761:
Purpose: Fix valgrind issues

Description:
Free image_data and data as appropriate in test_image.

r20762:
Purpose: Fix coverity issue 600

Description:
Add check for return value of H5O_close in H5Ocopy.  Also cleaned up various
warnings.

r20763:
Purpose: Fix valgrind issues with h5stat

Description:
Modified h5stat to free "iter" before exit, and free "hand" before exit if
parse_command_line exits directly.

r20764:
fixed coverity issues:
69, 327, 614, 684, 685, 696, 697, 1681, 967, 826, 660, 80

r20765:
Fixed coverity bug 668

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program but I did add a check that n_elements is >= 1.

I also changed an error condition from doing its own close and returning -1 to "goto out;" like the rest of the program.

r20766:
Fixed coverity bug 667

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program.


Tested on:
    Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
    (h5committest upcoming)
2013-05-11 11:42:54 -05:00
Dana Robinson
692af1936f [svn-r23573] Removed inappropriate executable properties from a few files. These are
often added by Windows text editors.

Tested on: jam (just tested to make sure it builds - no code changes)
2013-04-10 11:54:39 -05:00
Allen Byrne
b445540e3d [svn-r23559] Fix valgrind configure error
Tested: local linux - with and without valgrind
2013-04-08 10:46:14 -05:00
Albert Cheng
07d8b80b4a [svn-r23556] Bug fix: HDFFV-8358
The previous change set exec_prefix, libdir and includedir to actual values.
That removed the option for user to hand edit just the first prefix=...
to make "everything" to work.
Changed h5redeploy to do this by default:
## Installation directories:						  ##
## prefix	architecture-independent files.				  ##
## exec_prefix	architecture-dependent files, default is <prefix>.	  ##
## libdir	libraries, default is <exec_prefix>/lib.		  ##
## includedir	header files, default is <prefix/include>.		  ##
############################################################################
This allows users to just change the first line of prefix=<...> and the
effect will change libdir and includedir too.

This was also try to accommodate the -prefix option of h5XX. Unfortunately,
after changing h5redeploy, I found out the h5XX code to support -prefix
actually does not provide the stated efffect. This will be fixed in the
release.

Tested: h5committested plus hand test.
2013-04-05 13:32:49 -05:00
Raymond Lu
95332ad177 [svn-r23510] I merged the changes for DESY project from the trunk (r23496) into this 1.8 DESY branch.
Tested with h5committest (duck failed with CMake because I don't know how to change test/CMakeLists.txt.  I'll wait for Allen to do it).
2013-04-01 15:42:58 -05:00
Albert Cheng
b967faed84 [svn-r23498] Bug fix: HDFFV-8358
Change h5redeploy to change all 4 lines, prefix=..., exec_prefix=...,
libdir=..., and includedir=...  This way, it reset all 4 lines. Should work
for both version of h5cc created by configure or by rpm.

Tested: hand tested in jam.
2013-03-30 11:58:18 -05:00
Allen Byrne
4800a8d7a9 [svn-r23477] HDFFV-8359: correct script function calls.
Tested: local linux
2013-03-28 11:44:42 -05:00
Jonathan Kim
91c30cdc2f [svn-r23464] Purpose:
HDFFV-8214 - h5repack failed converting small chunked dataset (size < 1K) to contiguous layout.

Description:
  h5repack failed converting small chunked dataset (size < 1K) to contiguous layout.
  The first case was when chunk dim is bigger than the dataset dim (at leat one), h5repack failed with displaying error stacks.
  The other case is when chunk dim is smaller than the dataset dim, h5repack failed to change layout.
  Merged from HDF5 trunk 23407
    
Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), emu (solaris-BE), fred (mac64-LE), Windows (32-LE cmake), cmake (jam)
2013-03-27 10:10:25 -05:00
Allen Byrne
a605e303e9 [svn-r23460] Add missing infile assignment and error counts 2013-03-26 14:26:10 -05:00
Peter Cao
722ac5f543 [svn-r23459] HDFFV-8355 h5repack.sh was wrong for the two test cases. 2013-03-26 14:18:11 -05:00
Allen Byrne
b93cec6dc4 [svn-r23448] HDFFV-8322: valgrind leaks 2013-03-25 12:49:42 -05:00
Quincey Koziol
1218a11370 [svn-r23416] Description:
Bring r23415 from trunk to 1.8 branch:

Avoid using fpclassify() for detecting zero/non-zero values.

Tested on:
    Mac OSX/64 10.8.3 (amazon) w/debug
2013-03-21 13:21:19 -05:00
Quincey Koziol
1d95950134 [svn-r23396] Description:
Bring r23395 from trunk to 1.8 branch:

    Bring Coverity changes from branch to trunk:

r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343

Tested on:
    Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
    (too minor to require h5committest)
2013-03-19 23:41:16 -05:00
Peter Cao
a8b0ddf52b [svn-r23383] fixed HDFFV-8344 and HDFFV-8346: add info for user registered filter in h5dump 2013-03-19 13:48:23 -05:00
Allen Byrne
fc41dda51f [svn-r23355] Correct target name 2013-03-15 10:28:01 -05:00
HDF Tester
ab5a49b8bd [svn-r23324] Snapshot version 1.8 release 11 (snap11) 2013-03-03 21:47:16 -05:00
Allen Byrne
62ed247721 [svn-r23318] HDFFV-8311: Improve tools testing and eliminate dependency problems
Tested: local linux
2013-02-25 12:26:14 -05:00
Allen Byrne
0272351e49 [svn-r23315] Correct typo in DEPENDS 2013-02-25 11:41:24 -05:00
Jonathan Kim
6bf2f2482e [svn-r23309] Purpose:
HDFFV-7643 - h5diff - incorrect exit-code returns for extra attribute exist

Description:
   h5diff: Fixed to return correct exit code 1 when detect unique
   attribute. Prior to this fix, h5diff returned exit code 0 indicating 
   two files are identical.
   Merged from HDF5 trunk r23304.

Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), fred (mac64-LE), emu (solaris-BE),  Windows (32-LE cmake), cmake (jam)
2013-02-21 14:23:53 -05:00
Allen Byrne
bc617d2b63 [svn-r23302] Remove old file names 2013-02-18 14:10:11 -05:00
Allen Byrne
1629fd1ee7 [svn-r23301] 2013-02-18 14:03:53 -05:00
Jonathan Kim
bf59bd4d09 [svn-r23229]
Purpose: 
    Revert back one of the coverity updates from previous (r23220) checkin. "r20457: Coverity issue 691" in previous svn log.  Only revert the change about using "STDOUT_FILENO".

Description:
    Using "STDOUT_FILENO" caused error on Windows. On unix it's defined in <unistd.h>, but not in Windows.  After a little discussion with Allen, he remembered how the similar case were handled for h5dump redirecting those streams. (in h5dump.c) However it would requires more attention to apply, so this issue is entered as a separate task in jira HDDFV-8306.

    
Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), fred (mac64-LE)
2013-02-05 11:13:49 -05:00
Quincey Koziol
9474760400 [svn-r23220] Description:
Bring r23219 from trunk to 1.8 branch:

   Bring reviewed changes from Coverity branch back to trunk (QK & JK):

r20457:
Coverity issue 691: return of H5duo could be negative. Fixed by using
STDOUT_FILENO and redesign parse_command_line and main to cleanup file
allocations. The output_file var is null when using stdout. In cleanup do not
close output_file if NULL.

r20510:
Initialize ufid = -1 and predicate HDclose call on ufid != -1

r20511:
Purpose: Fix coverity issue 1715

Description: Free "file" and nested data on failure in H5FD_core_open.

r20512:
Initialize ifid = -1 and predicate HDclose call on ifid != -1

r20514:
Initialize h5fid = -1 and predicate HDclose call on h5fid != -1

r20516:
Added else branch to the if (ret_value < 0) check.

r20522:
Addressed coverity issues 930-933, 850, 836, 835, 1307.  All minor 
potential buffer overwrite bugs, or coverity errors.  Fixed by replacing
strcpy and sprintf with strncpy and snprintf.

r20523:
fixed coverity issues 68, 1120, 1116i

r20524:
Check  H5Z_SZIP->encoder_present < 1 assuming 0 represents absence.

r20601:
Purpose: Fix coverity issues 1703-1705

Description: Modified the cleanup code in test_free in accum.c to reset
allocated buffers to NULL after they are freed, and modified the error cleanup
code to check if these buffers are NULL before freeing them.  Also fixed some
unrelated warnings in accum.c.

r20602:
Use HDsnprintf and HDstrncat

r20603:
Purpose: Fix coverity issues 808-809

Description: Modified test_core in vfd.c to check the returns from malloc, and
keep track of whether points and check are allocated by setting them to NULL
when they are not.  Added code to free points and check on error if they are
not NULL.  Also fixed unrelated warnings in vfd.c.

r20604:
Use HDstrncpy.

r20605:
Use HDstrncpy and HDstrncat.

r20606:
Purpose: Fix coverity issue 807

Description: Modified long_compact in stab.c to keep track of whether objname is
allocated by setting it to NULL when it is not.  Added code to free objname on
error if it is not NULL.

r20607:
Changed string function calls to use versions that specify the string length
to fix coverity issues 832 and 839.


Tested on:
    Mac OSX/64 10.8.2 (amazon)
    (Too minor to require h5committest)
2013-02-01 21:42:36 -05:00
Allen Byrne
13693b307c [svn-r23211] Merge trunk CMake changes for minimum cmake version of 2.8.10. This was prompted by HDFFV-8227, OS X requires latest version of cmake for proper support.
Tested: local linux
2013-01-31 12:30:34 -05:00
Allen Byrne
6a98cfb434 [svn-r23187] HDFFV-8169: Binary output of String types are wrong
Merge from trunk
Add testfiles.
Tested: local linux
2013-01-22 10:38:36 -05:00
Allen Byrne
ff3020dabf [svn-r23186] HDFFV-8169: Binary output of String types are wrong
Merge from trunk
2013-01-22 09:49:47 -05:00