[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)

5 files changed, 7 insertions, 18 deletions

diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index bf13c0b..3abb0b9 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -212,10 +212,6 @@ nh5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsattach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
-
-HDF5_HL_F90CSTUBDLL
-int_f
 nh5dsdetach_scale_c( hid_t_f *did, hid_t_f *dsid, int_f *idx);
 
 HDF5_HL_F90CSTUBDLL
@@ -224,16 +220,15 @@ nh5dsis_attached_c( hid_t_f *did, hid_t_f *dsid, int_f *idx, int_f *c_is_attache
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
+nh5dsis_scale_c(hid_t_f *did, int_f *is_scale);
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsis_scale_c(hid_t_f *did, int_f *is_scale);
-
+nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen);
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen);
+nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size);
 
 HDF5_HL_F90CSTUBDLL
 int_f
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index c7c1719..e60d587 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -1872,12 +1872,9 @@ ssize_t H5DSget_scale_name(hid_t did,
     if (H5Sclose(sid) < 0)
         goto out;
     if (buf)
-    {
         free(buf);
-        buf=NULL;
-    }
 
-    return (ssize_t) MAX(0,nbytes-1);
+    return (ssize_t)(nbytes - 1);
 
     /* error zone */
 out:
@@ -1887,10 +1884,7 @@ out:
         H5Sclose(sid);
     } H5E_END_TRY;
     if (buf)
-    {
         free(buf);
-        buf=NULL;
-    }
     return FAIL;
 }
 
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index b2c8949..98f2ff2 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -2161,7 +2161,6 @@ out:
 */
 hid_t H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type)
 {
-    extern int H5LTyyparse(void);
     hid_t   type_id;
 
     if(lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
diff --git a/hl/src/H5LTprivate.h b/hl/src/H5LTprivate.h
index 69616b1..0ee6b5c 100644
--- a/hl/src/H5LTprivate.h
+++ b/hl/src/H5LTprivate.h
@@ -48,5 +48,6 @@ H5_HLDLL herr_t  H5LT_find_attribute( hid_t loc_id, const char *name );
 H5_HLDLL char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang,
                                     size_t *slen, hbool_t no_user_buf);
 
+H5_HLDLL int H5LTyyparse(void);
 
 #endif
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 5375cde..ad17206 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -1820,7 +1820,6 @@ out:
 static int test_valid_path(void)
 {
   hid_t file_id, group;
-  herr_t status;
   FILE *fp = NULL;
   htri_t path_valid;
   const char *data_string_in = "test";
@@ -1952,7 +1951,8 @@ static int test_valid_path(void)
   /*
    * Close the file.
    */
-  status = H5Fclose (file_id);
+  if(H5Fclose (file_id) < 0)
+      goto out;
 
   /* Create another file for checking external links */