[svn-r20537] Description:

	Bring r20535 & r20536 from trunk to 1.8 branch:

	Add explicit test that checks that the 'fileno' field in H5O_info_t
is the same for objects in the same file, whether the file was opened twice
or not.

	Clean up various warnings & code formatting issues.

	Bring changes from Coverity branch to trunk:

r20085:
Purpose: Fix coverity issue 793

Description: Modified H5S_hyper_project_simple_higher() to free the entire span
list in new_space on failure.


r20091:
This is a fix for coverity bug #1683.
Changed the two printfs to use %lu (unsigned long) for printing "dset_size".


r20162:
Purpose: Fix coverity issue 785

Description: Modified H5T_enum_nameof() to free "name" on failure if it was
allocated.  Also clarified some code in H5S_hyper_rebuild_helper().


r20189:
Addressed coverity defect 783.

H5SL_new_node() in H5SL.c was failing to free space allocated in its
first alloc if the second alloc failed.  Added a call to H5FL_FREE
to address this issue.

This is purely to keep coverity happy -- if this code is ever triggered,
we have much larger problems.

Note that this fix will trigger an unused return value complaint
from coverity next week.


r20190:
Fixed Coverity issues 1561 1565 and 1678 (UNUSED_VALUES) by moving checks of return values to after the function call.


r20191:
Fixed coverity issues 643 644 and 1678 (CHECKED_RETURN).


r20232:
Addressed coverity issues 923-925.  Replaced calls to sprintf with calls
to HDsnprintf.


r20233:
Fix coverity issue 662.  Don't try to sort 0 attributes in H5Aint.c.


r20234:
Fix coverity issue 664.  Check for NULL before dereferencing in H5Gdeprec.c.


r20271:
Purpose: Fix coverity issue 784

Description: Modified H5_debug_mask() to keep a list of files opened for use as
a debugging output stream, and modified H5_term_library to close these files on
exit.


r20272:
addressed coverity issues 838 & 955.  Issue was use of strcpy() -- existing
code was safe, but modified to use strncpy() to keep coverity happy.


r20273:
Addresed coverity issues 1388 and 1389.
Initialized sel_iter->type to NULL in H5S_select_iter_init.


r20275:
Purpose: Fix valgrind issue in mf.c

Description: Fixed bug (incomplete if statement) in test_mf_fs_alloc_free() so
the retrieved node gets freed.


Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, 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

1 files changed, 6 insertions, 0 deletions

diff --git a/test/tvlstr.c b/test/tvlstr.c
index 87008aa..02bd59d 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -388,6 +388,7 @@ static void test_vlstring_type(void)
     hid_t               tid_vlstr;
     H5T_cset_t          cset;
     H5T_str_t           pad;
+    htri_t              vl_str;         /* Whether string is VL */
     herr_t              ret;
 
     /* Output message about test being performed */
@@ -417,6 +418,11 @@ static void test_vlstring_type(void)
     ret = H5Tis_variable_str(tid_vlstr);
     VERIFY(ret, TRUE, "H5Tis_variable_str");
 
+    /* Verify that the class detects as a string */
+    vl_str = H5Tdetect_class(tid_vlstr, H5T_STRING);
+    CHECK(vl_str, FAIL, "H5Tdetect_class");
+    VERIFY(vl_str, TRUE, "H5Tdetect_class");
+
     /* Check default character set and padding */
     cset = H5Tget_cset(tid_vlstr);
     VERIFY(cset, H5T_CSET_ASCII, "H5Tget_cset");