From 480e8d4c9cf0d4b399de7564cc15c4b372e90f51 Mon Sep 17 00:00:00 2001
From: Raymond Lu <songyulu@hdfgroup.org>
Date: Wed, 28 Apr 2004 12:40:45 -0500
Subject: [svn-r8426] Purpose:  Bug fix

Description:  H5Pset_type_conv_cb and H5Pget_type_conv_cb weren't put into
H5MPprivate.h.  Another thing is the func type doesn't match the func field
in the struct in these functions.


Platforms tested: RH 8(fuss) and sleipnir
---
 src/H5MPprivate.h | 4 ++--
 src/H5Pdxpl.c     | 4 ++--
 src/H5Ppublic.h   | 4 ++--
 src/H5Tprivate.h  | 6 ++++++
 src/H5Tpublic.h   | 6 ------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index 0b33c54..3547b4e 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -219,8 +219,6 @@
 #define color_H5Tunregister "red"
 #define color_H5Tfind "red"
 #define color_H5Tconvert "red"
-#define color_H5Tget_overflow "red"
-#define color_H5Tset_overflow "red"
 #define color_H5Tget_native_type "red"
 
 #define color_H5Acreate "red"
@@ -366,6 +364,8 @@
 #define color_H5Pget_edc_check "red"
 #define color_H5Pset_edc_check "red"
 #define color_H5Pset_filter_callback "red"
+#define color_H5Pset_type_conv_cb "red"
+#define color_H5Pget_type_conv_cb "red"
 
 #define color_H5Screate "red"
 #define color_H5Screate_simple "red"
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index e5bd817..04f4783 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -364,7 +364,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void *operate_data)
+H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_data)
 {
     H5P_genplist_t      *plist;      /* Property list pointer */
     herr_t              ret_value=SUCCEED;   /* return value */
@@ -406,7 +406,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t **op, void **operate_data)
+H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_data)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     H5T_conv_cb_t       cb_struct;
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 0b37e45..cae9337 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -301,8 +301,8 @@ H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/);
 H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
 H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/);
 H5_DLL herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
-H5_DLL herr_t H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void* operate_data);
-H5_DLL herr_t H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t **op, void** operate_data);
+H5_DLL herr_t H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t op, void* operate_data);
+H5_DLL herr_t H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void** operate_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index fcd2f28..41181e2 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -57,6 +57,12 @@ typedef struct {
     void *free_info;            /* Free information */
 } H5T_vlen_alloc_info_t;
 
+/* Structure for conversion callback property */
+typedef struct H5T_conv_cb_t {
+    H5T_conv_except_func_t      func;
+    void*                       user_data;
+} H5T_conv_cb_t;
+
 /* Private functions */
 H5_DLL herr_t H5TN_init_interface(void);
 H5_DLL herr_t H5T_init(void);
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 608606d..403419f 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -207,12 +207,6 @@ typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(int except_type, hid_t src_id, 
             hid_t dst_id, void *src_buf, void *dst_buf, void *user_data);
 
-/* Structure for conversion callback property */
-typedef struct H5T_conv_cb_t {
-    H5T_conv_except_func_t      func;
-    void*                       user_data;
-} H5T_conv_cb_t;
-
 /* When this header is included from H5Tprivate.h, don't make calls to H5open() */
 #undef H5OPEN
 #ifndef _H5Tprivate_H
-- 
cgit v0.12