[svn-r7219] Purpose:

    Bug fix

Description:
    H5T_BKG_TEMP was accidentally removed from library code, but is used by
    application's datatype conversion routines.

Solution:
    Revert removal of H5T_BKG_TEMP.

Platforms tested:
    h5committest

3 files changed, 21 insertions, 20 deletions

diff --git a/src/H5Dio.c b/src/H5Dio.c
index 8179b4c..00128d1 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -1069,7 +1069,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S
     if (need_bkg && NULL==(bkg_buf=H5P_peek_voidp(dx_plist,H5D_XFER_BKGR_BUF_NAME))) {
         /* Allocate background buffer */
         H5_CHECK_OVERFLOW((request_nelmts*dst_type_size),hsize_t,size_t);
-        if((bkg_buf=H5FL_BLK_MALLOC(type_conv,(size_t)(request_nelmts*dst_type_size)))==NULL)
+        if((bkg_buf=H5FL_BLK_CALLOC(type_conv,(size_t)(request_nelmts*dst_type_size)))==NULL)
             HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion");
     } /* end if */
 
@@ -1102,7 +1102,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S
 	if (n!=smine_nelmts)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed");
 	
-        if (need_bkg) {
+        if (H5T_BKG_YES==need_bkg) {
 #ifdef H5S_DEBUG
             H5_timer_begin(&timer);
 #endif
@@ -1296,15 +1296,15 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
      * malloc() is usually less resource-intensive if we allocate/free the
      * same size over and over.
      */
-    if (H5T_path_bkg(tpath)) {
+    if(H5T_detect_class(dataset->type, H5T_VLEN)) {
+	/* Old data is retrieved into background buffer for VL datatype.  The 
+	 * data is used later for freeing heap objects. */
+        need_bkg = H5T_BKG_YES;
+    } else if (H5T_path_bkg(tpath)) {
         /* Retrieve the bkgr buffer property */
         if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg)<0)
             HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer type");
         need_bkg = MAX (H5T_path_bkg(tpath), need_bkg);
-    } else if(H5T_detect_class(dataset->type, H5T_VLEN)) {
-	/* Old data is retrieved into background buffer for VL datatype.  The 
-	 * data is used later for freeing heap objects. */
-        need_bkg = H5T_BKG_YES;
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
@@ -1344,7 +1344,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
         if (n!=smine_nelmts)
             HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed");
 
-        if (need_bkg) {
+        if (H5T_BKG_YES==need_bkg) {
 #ifdef H5S_DEBUG
             H5_timer_begin(&timer);
 #endif
@@ -1603,7 +1603,7 @@ UNUSED
     if (need_bkg && NULL==(bkg_buf=H5P_peek_voidp(dx_plist,H5D_XFER_BKGR_BUF_NAME))) {
         /* Allocate background buffer */
         H5_CHECK_OVERFLOW((request_nelmts*dst_type_size),hsize_t,size_t);
-        if((bkg_buf=H5FL_BLK_MALLOC(type_conv,(size_t)(request_nelmts*dst_type_size)))==NULL)
+        if((bkg_buf=H5FL_BLK_CALLOC(type_conv,(size_t)(request_nelmts*dst_type_size)))==NULL)
             HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for background conversion");
     } /* end if */
     
@@ -1674,7 +1674,7 @@ UNUSED
             if (n!=smine_nelmts)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed");
 
-            if (need_bkg) {
+            if (H5T_BKG_YES==need_bkg) {
 #ifdef H5S_DEBUG
                 H5_timer_begin(&timer);
 #endif
@@ -1983,15 +1983,15 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * malloc() is usually less resource-intensive if we allocate/free the
      * same size over and over.
      */
-    if (H5T_path_bkg(tpath)) {
+    if(H5T_detect_class(dataset->type, H5T_VLEN)) {
+	/* Old data is retrieved into background buffer for VL datatype.  The 
+	 * data is used later for freeing heap objects. */
+        need_bkg = H5T_BKG_YES;
+    } else if (H5T_path_bkg(tpath)) {
         /* Retrieve the bkgr buffer property */
         if(H5P_get(dx_plist, H5D_XFER_BKGR_BUF_TYPE_NAME, &need_bkg)<0)
             HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, FAIL, "Can't retrieve background buffer type");
         need_bkg = MAX (H5T_path_bkg(tpath), need_bkg);
-    } else if(H5T_detect_class(dataset->type, H5T_VLEN)) {
-	/* Old data is retrieved into background buffer for VL datatype.  The 
-	 * data is used later for freeing heap objects. */
-        need_bkg = H5T_BKG_YES;
     } else {
         need_bkg = H5T_BKG_NO; /*never needed even if app says yes*/
     } /* end else */
@@ -2070,7 +2070,7 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
             if (n!=smine_nelmts)
                 HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed");
 
-            if (need_bkg) {
+            if (H5T_BKG_YES==need_bkg) {
 #ifdef H5S_DEBUG
                 H5_timer_begin(&timer);
 #endif
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index ab4ef71..c9329bd 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -2240,7 +2240,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             }
 
             /* Check if we need a temporary buffer for this conversion */
-            if(tpath->cdata.need_bkg||H5T_detect_class(dst->parent,H5T_VLEN)) {
+            if(tpath->cdata.need_bkg || H5T_detect_class(dst->parent,H5T_VLEN)) {
                 /* Set up initial background buffer */
                 tmp_buf_size=MAX(src_base_size,dst_base_size);
                 if ((tmp_buf=H5FL_BLK_CALLOC(vlen_seq,tmp_buf_size))==NULL)
@@ -2276,8 +2276,8 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
                 /* Check if temporary buffer is large enough, resize if necessary */      
                 /* (Chain off the conversion buffer size) */
-                if((tpath->cdata.need_bkg||H5T_detect_class(dst->parent,
-		    H5T_VLEN)) && tmp_buf_size<conv_buf_size) {
+                if((tpath->cdata.need_bkg || H5T_detect_class(dst->parent, H5T_VLEN))
+                        && tmp_buf_size<conv_buf_size) {
                     /* Set up initial background buffer */
                     tmp_buf_size=conv_buf_size;
                     if((tmp_buf=H5FL_BLK_REALLOC(vlen_seq,tmp_buf,tmp_buf_size))==NULL)
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 8bea043..b9902d1 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -141,7 +141,8 @@ typedef enum H5T_cmd_t {
 /* How is the `bkg' buffer used by the conversion function? */
 typedef enum H5T_bkg_t {
     H5T_BKG_NO		= 0, 	/*background buffer is not needed, send NULL */
-    H5T_BKG_YES		= 1	/*init bkg buf with data before conversion   */
+    H5T_BKG_TEMP	= 1,	/*bkg buffer used as temp storage only       */
+    H5T_BKG_YES		= 2	/*init bkg buf with data before conversion   */
 } H5T_bkg_t;
 
 /* Type conversion client data */