[svn-r19655] Description:

    Bring r19654 from trunk to 1.8 branch:

Bring Coverity revisions from branch back to trunk, and clean up some other
misc. compiler warnings also.

r19500:
Fix coverity items 1446 and 1447.  Moved up calls to memset in test_cont in
ohdr.c so the test never tries to close uninitialized locations.

r19501:
Fix coverity items 1398-1445.  Various uninitialized variable errors in fheap.c.

r19502:
Fixed coverity issue 579 and some additional warnings in the file as well.

r19503:
Bug fix: This fix addressed the "RESOURCE_LEAK" problems #789 and 790, run 26

r19504:
minor mods to try to keep coverity from flagging false positives.

r19505:
Fixed coverity issues 566 - 571.  Declared variables that are passed to functions that use them as arrays to be arrays of size 1.


Tested on:
   Mac OS X/32 10.6.4 (amazon) w/debug, production & parallel
  (h5committested on coverity branch)

1 files changed, 13 insertions, 28 deletions

diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index e0748b5b..12c55af 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -36,7 +36,6 @@
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, August 3, 1999
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertypes )
@@ -254,7 +253,6 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, August 3, 1999
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
 nh5close_types_c( hid_t_f * types, int_f *lentypes,
@@ -300,13 +298,6 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, August 3, 1999
- * Modifications:     Added Z flags. EIP,  March 12, 2003
- *                    Added more FD flags and new H5LIB flags
- *                    Added more FD flags for HDF5 file driver
- *                                  EIP, April 9, 2005
- *                    Added Generic flags introduced in version 1.8
- *                                  MSB, January, 2008
- *                    Added types in lines h5*_flags = ( )variable to match input
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
@@ -644,36 +635,34 @@ nh5init1_flags_c(int_f *h5lib_flags)
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Friday, November 17, 2000
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5open_c()
+nh5open_c(void)
 {
-
     int ret_value = -1;
+
     if (H5open() < 0) return ret_value;
     ret_value = 0;
     return ret_value;
 }
+
 /*---------------------------------------------------------------------------
  * Name:              h5close_c
  * Purpose:           Calls H5close call to close C HDF5 library
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Friday, November 17, 2000
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5close_c()
+nh5close_c(void)
 {
-
     int ret_value = -1;
+
     if (H5close() < 0) return ret_value;
     ret_value = 0;
     return ret_value;
 }
 
-
 /*---------------------------------------------------------------------------
  * Name:              h5get_libversion_c
  * Purpose:           Calls H5get_libversion function
@@ -687,10 +676,9 @@ nh5close_c()
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, September 24, 2002
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5get_libversion_c( int_f *majnum, int_f *minnum, int_f *relnum)
+nh5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum)
 {
 
     int ret_value = -1;
@@ -705,7 +693,6 @@ nh5get_libversion_c( int_f *majnum, int_f *minnum, int_f *relnum)
     return ret_value;
 }
 
-
 /*---------------------------------------------------------------------------
  * Name:              h5check_version_c
  * Purpose:           Calls H5check_version function
@@ -719,14 +706,13 @@ nh5get_libversion_c( int_f *majnum, int_f *minnum, int_f *relnum)
  * Returns:           0 on success, aborts on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, September 24, 2002
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5check_version_c( int_f *majnum, int_f *minnum, int_f *relnum)
+nh5check_version_c(int_f *majnum, int_f *minnum, int_f *relnum)
 {
-
     int ret_value = -1;
     unsigned c_majnum, c_minnum, c_relnum;
+
     c_majnum = (unsigned) *majnum;
     c_minnum = (unsigned) *minnum;
     c_relnum = (unsigned) *relnum;
@@ -743,13 +729,12 @@ nh5check_version_c( int_f *majnum, int_f *minnum, int_f *relnum)
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, September 24, 2002
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5garbage_collect_c()
+nh5garbage_collect_c(void)
 {
-
     int ret_value = -1;
+
     if (H5garbage_collect() < 0) return ret_value;
     ret_value = 0;
     return ret_value;
@@ -761,14 +746,14 @@ nh5garbage_collect_c()
  * Returns:           0 on success, -1 on failure
  * Programmer:        Elena Pourmal
  *                    Tuesday, September 24, 2002
- * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5dont_atexit_c()
+nh5dont_atexit_c(void)
 {
-
     int ret_value = -1;
+
     if (H5dont_atexit() < 0) return ret_value;
     ret_value = 0;
     return ret_value;
 }
+