[svn-r745] Changes since 19981002

----------------------

./doc/html/H5.format.html
./src/H5HG.c
	Fixed a bug in the global heap that caused H5HG_read() to
	write past the end of the buffer in certain cases.

./test/big.c
	The test is skipped if hdf5 was configured with
	`--disable-hsizet'.

./src/H5Ofill.c
	Data type conversions are implemented for the fill value.

./src/H5.c
	Tracing prints one of H5P_FILE_CREATE, H5P_FILE_ACCESS,
	H5P_DATASET_CREATE, H5P_DATASET_XFER, or H5P_MOUNT instead of
	the more cryptic H5I_TEMPLATE_* constants.

./src/H5D.c
	Removed prototype for H5D_find_name().

./src/H5I.c
	The GROUP_MASK and ID_MASK are both calculated from GROUP_BITS
	instead of being set by hand.

	We don't use the sign bit of hid_t; all valid hid_t values are
	positive so we can say things like `if ((file=H5Fopen(...))<0)'.

	Changed `(int)pow(2.0,x)' to `1<<x' so we don't have to worry
	about rounding.

	Fixed H5I_get_type() so it doesn't always fail an assertion.

./src/H5E.c
./src/H5Epublic.h
	Added minor error H5E_MOUNT

./src/H5F.c
./src/H5Fprivate.h
	Added H5Fmount() and H5Funmount().  Mounting and unmounting
	works as documented but some of the other things aren't
	implemented yet, the biggest being current working groups
	always acting on the root of the mount tree, and H5Fclose()
	closing the entire tree.  The rest of the stuff will be added
	shortly...

./src/H5P.c
./src/H5Ppublic.h
	Added the H5P_MOUNT property list but haven't implemented any
	particular properties for it yet.

./src/H5Gstab.c
	Hard links across files return an error instead of failing an
	assertion.

1 files changed, 78 insertions, 6 deletions

diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 29e5914..cdedf98 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -10,6 +10,7 @@
  */
 #include <H5private.h>
 #include <H5Eprivate.h>
+#include <H5Iprivate.h>
 #include <H5MMprivate.h>
 #include <H5Oprivate.h>
 
@@ -296,7 +297,9 @@ H5O_fill_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent,
  * Function:	H5O_fill_convert
  *
  * Purpose:	Convert a fill value from whatever data type it currently has
- *		to the specified data type.
+ *		to the specified dataset type.  The `type' field of the fill
+ *		value struct will be set to NULL to indicate that it has the
+ *		same type as the dataset.
  *
  * Return:	Success:	SUCCEED
  *
@@ -312,6 +315,16 @@ H5O_fill_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent,
 herr_t
 H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type)
 {
+    H5T_cdata_t		*cdata=NULL;		/*conversion data	*/
+    H5T_conv_t		cfunc=NULL;		/*conversion function	*/
+    void		*buf=NULL, *bkg=NULL;	/*conversion buffers	*/
+    herr_t		status;			/*conversion status	*/
+    hid_t		src_id=-1, dst_id=-1;	/*data type identifiers	*/
+    herr_t		ret_value=FAIL;		/*return value		*/
+#ifdef H5T_DEBUG
+    H5_timer_t		timer;			/*debugging timer	*/
+#endif
+
     FUNC_ENTER(H5O_fill_convert, FAIL);
     assert(fill);
     assert(dset_type);
@@ -322,10 +335,69 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type)
 	fill->type = NULL;
 	HRETURN(SUCCEED);
     }
-    
-    
-    HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
-		  "fill value conversion not supported yet");
 
-    FUNC_LEAVE(SUCCEED);
+    /*
+     * Can we convert between source and destination data types?
+     */
+    if (NULL==(cfunc=H5T_find(fill->type, dset_type, H5T_BKG_NO, &cdata))) {
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+		    "unable to convert between src and dst data types");
+    }
+    if ((src_id = H5I_register(H5I_DATATYPE,
+			       H5T_copy(fill->type, H5T_COPY_TRANSIENT)))<0 ||
+	(dst_id = H5I_register(H5I_DATATYPE,
+			       H5T_copy(dset_type, H5T_COPY_TRANSIENT)))<0) {
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+		    "unable to copy/register data type");
+    }
+
+    /*
+     * Data type conversions are always done in place, so we need a buffer
+     * that is large enough for both source and destination.
+     */
+    if (H5T_get_size(fill->type)>=H5T_get_size(dset_type)) {
+	buf = fill->buf;
+    } else {
+	if (NULL==(buf=H5MM_malloc(H5T_get_size(dset_type)))) {
+	    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+			"memory allocation failed for type conversion");
+	}
+	HDmemcpy(buf, fill->buf, H5T_get_size(fill->type));
+    }
+    if (cdata->need_bkg>=H5T_BKG_TEMP &&
+	NULL==(bkg=H5MM_malloc(H5T_get_size(dset_type)))) {
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+		    "memory allocation failed for type conversion");
+    }
+
+    /* Do the conversion */
+#ifdef H5T_DEBUG
+    H5T_timer_begin(&timer, cdata);
+#endif
+    cdata->command = H5T_CONV_CONV;
+    status = (cfunc)(src_id, dst_id, cdata, 1, buf, bkg);
+#ifdef H5T_DEBUG
+    H5T_timer_end(&timer, cdata, 1);
+#endif
+    if (status<0) {
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+		    "data type conversion failed");
+    }
+
+    /* Update the fill message */
+    if (buf!=fill->buf) {
+	H5MM_xfree(fill->buf);
+	fill->buf = buf;
+    }
+    H5T_close(fill->type);
+    fill->type = NULL;
+    fill->size = H5T_get_size(dset_type);
+    ret_value = SUCCEED;
+
+ done:
+    if (src_id>=0) H5I_dec_ref(src_id);
+    if (dst_id>=0) H5I_dec_ref(dst_id);
+    if (buf!=fill->buf) H5MM_xfree(buf);
+    H5MM_xfree(bkg);
+    FUNC_LEAVE(ret_value);
 }