[svn-r17547] Description:

	Bring r17518:17546 from trunk to revise_chunks branch

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/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) 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, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

5 files changed, 17 insertions, 17 deletions

diff --git a/src/H5.c b/src/H5.c
index f11e8b7..4041483 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -621,7 +621,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
     char	lib_str[256];
     char	substr[] = H5_VERS_SUBRELEASE;
     static int	checked = 0;            /* If we've already checked the version info */
-    static int	disable_version_check = 0;      /* Set if the version check should be disabled */
+    static unsigned int	disable_version_check = 0;      /* Set if the version check should be disabled */
     herr_t      ret_value=SUCCEED;       /* Return value */
     static char *version_mismatch_warning=VERSION_MISMATCH_WARNING;
 
@@ -638,7 +638,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
         s = HDgetenv ("HDF5_DISABLE_VERSION_CHECK");
 
         if (s && HDisdigit(*s))
-            disable_version_check = (int)HDstrtol (s, NULL, 0);
+            disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
     }
 
     if (H5_VERS_MAJOR!=majnum || H5_VERS_MINOR!=minnum ||
@@ -648,7 +648,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
 	    HDfprintf(stderr, "%s%s", version_mismatch_warning,
 		     "You can, at your own risk, disable this warning by setting the environment\n"
 		     "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
-		     "Setting it to 2 will suppress the warning messages totally.\n");
+		     "Setting it to 2 or higher will suppress the warning messages totally.\n");
 	    /* Mention the versions we are referring to */
 	    HDfprintf (stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n",
 		     majnum, minnum, relnum,
@@ -659,12 +659,9 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
 	    /* Bail out now. */
 	    HDfputs ("Bye...\n", stderr);
 	    HDabort ();
-	case 2:
-	    /* continue silently */
-	    break;
-	default:
+	case 1:
 	    /* continue with a warning */
-	    /* Note that the warning message is embedded in the format string. */
+	    /* Note that the warning message is embedded in the format string.*/
             HDfprintf (stderr,
                      "%s'HDF5_DISABLE_VERSION_CHECK' "
                      "environment variable is set to %d, application will\n"
@@ -677,6 +674,9 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
 	    /* Show library settings if available */
 	    HDfprintf (stderr, "%s", H5libhdf5_settings);
 	    break;
+	default:
+	    /* 2 or higer: continue silently */
+	    break;
         } /* end switch */
 
     } /* end if */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 56f1929..364cab2 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -277,7 +277,7 @@ H5P_do_prop_cb1(H5SL_t *slist, H5P_genprop_t *prop, H5P_prp_cb1_t cb)
         HGOTO_ERROR (H5E_PLIST, H5E_CANTINIT, FAIL,"Property callback failed");
 
     /* Check if the property value changed */
-    if(HDmemcmp(tmp_value,prop->value,prop->size)) {
+    if((prop->cmp)(tmp_value,prop->value,prop->size)) {
         /* Make a copy of the class's property */
         if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
             HGOTO_ERROR (H5E_PLIST, H5E_CANTCOPY, FAIL,"Can't copy property");
@@ -2264,7 +2264,7 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
                             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set property value");
                         } /* end if */
 
-                        if(HDmemcmp(tmp_value,prop->value,prop->size)) {
+                        if((prop->cmp)(tmp_value,prop->value,prop->size)) {
                             /* Make a copy of the class's property */
                             if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
                                 HGOTO_ERROR(H5E_PLIST,H5E_CANTCOPY,FAIL,"Can't copy property");
@@ -2282,7 +2282,7 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
                     } /* end if */
                     /* No 'set' callback, just copy value */
                     else {
-                        if(HDmemcmp(value,prop->value,prop->size)) {
+                        if((prop->cmp)(value,prop->value,prop->size)) {
                             /* Make a copy of the class's property */
                             if((pcopy=H5P_dup_prop(prop,H5P_PROP_WITHIN_LIST)) == NULL)
                                 HGOTO_ERROR(H5E_PLIST,H5E_CANTCOPY,FAIL,"Can't copy property");
@@ -3614,7 +3614,7 @@ H5P_get(const H5P_genplist_t *plist, const char *name, void *value)
                             HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set property value");
                         } /* end if */
 
-                        if(HDmemcmp(tmp_value,prop->value,prop->size)) {
+                        if((prop->cmp)(tmp_value,prop->value,prop->size)) {
                             H5P_genprop_t *pcopy;  /* Copy of property to insert into skip list */
 
                             /* Make a copy of the class's property */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index a67ea71..495ba42 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -292,7 +292,7 @@ H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned filter,
        unsigned cd_values[]/*out*/,
        size_t namelen, char name[],
        unsigned *filter_config /*out*/);
-H5_DLL H5Z_filter_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id,
+H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id,
        unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
        unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/,
        unsigned *filter_config/*out*/);
@@ -419,7 +419,7 @@ H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size,
 H5_DLL H5Z_filter_t H5Pget_filter1(hid_t plist_id, unsigned filter,
     unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
     unsigned cd_values[]/*out*/, size_t namelen, char name[]);
-H5_DLL H5Z_filter_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
+H5_DLL herr_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
     unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
     unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/);
 
diff --git a/src/H5public.h b/src/H5public.h
index 9ea660e..2808b01 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -71,10 +71,10 @@ extern "C" {
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	46	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_RELEASE	47	/* For tweaks, bug-fixes, or development     */
 #define H5_VERS_SUBRELEASE "FA_a4"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.9.46-FA_a4"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.9.47-FA_a4"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index 9c3cc5f..341baee 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -433,7 +433,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 36
+LT_VERS_REVISION = 37
 LT_VERS_AGE = 0
 H5detect_CFLAGS = -g