[svn-r22165] reorder the callbacks in the VOL struct to have create, open, ..., close ordering

1 files changed, 10 insertions, 11 deletions

diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index b8eafa4..ede4358 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -77,36 +77,35 @@ typedef enum H5VL_object_lookup_t {
 
 /* H5F routines */
 typedef struct H5VL_file_class_t {
-    hid_t  (*open)  (const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id);
-    herr_t (*close) (hid_t file_id);
     hid_t  (*create)(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id);
+    hid_t  (*open)  (const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id);
     herr_t (*flush) (hid_t file_id, H5F_scope_t scope);
     herr_t (*get)   (hid_t file_id, H5VL_file_get_t get_type, int num_args, va_list arguments);
+    herr_t (*close) (hid_t file_id);
 } H5VL_file_class_t;
 
 /* H5D routines */
 typedef struct H5VL_dataset_class_t {
-    hid_t  (*open)  (hid_t loc_id, const char *name, hid_t dapl_id);
-    herr_t (*close) (hid_t dataset_id);
     hid_t  (*create)(hid_t loc_id, const char *name, hid_t dtype_id, hid_t space_id, 
                      hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id);
+    hid_t  (*open)  (hid_t loc_id, const char *name, hid_t dapl_id);
     herr_t (*read)  (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
                      hid_t xfer_plist_id, void * buf);
     herr_t (*write) (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
                      hid_t xfer_plist_id, const void * buf );
     herr_t (*get)   (hid_t file_id, H5VL_dataset_get_t get_type, int num_args, va_list arguments);
+    herr_t (*close) (hid_t dataset_id);
 } H5VL_dataset_class_t;
 
 /* H5A routines */
 typedef struct H5VL_attribute_class_t {
-    hid_t  (*open)  (hid_t obj_id, const char *attr_name, hid_t aapl_id);
-    herr_t (*close) (hid_t attr_id);
     hid_t  (*create)( hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, 
                       hid_t acpl_id, hid_t aapl_id);
-    herr_t (*delete)(hid_t loc_id, const char *attr_name );
+    hid_t  (*open)  (hid_t obj_id, const char *attr_name, hid_t aapl_id);
     herr_t (*read)  (hid_t attr_id, hid_t mem_type_id, void *buf );
-    herr_t (*write) (hid_t attr_id, hid_t mem_type_id, 
-                     const void *buf );
+    herr_t (*write) (hid_t attr_id, hid_t mem_type_id, const void *buf );
+    herr_t (*delete)(hid_t loc_id, const char *attr_name );
+    herr_t (*close) (hid_t attr_id);
 } H5VL_attribute_class_t;
 
 /* H5T routines*/
@@ -131,20 +130,20 @@ typedef struct H5VL_link_class_t {
 typedef struct H5VL_group_class_t {
     hid_t  (*create)(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id);
     hid_t  (*open)  (hid_t loc_id, const char *name, hid_t gapl_id);
-    herr_t (*close) (hid_t group_id);
     herr_t (*get)   (hid_t file_id, H5VL_group_get_t get_type, int num_args, va_list arguments);
+    herr_t (*close) (hid_t group_id);
 } H5VL_group_class_t;
 
 /* H5O routines */
 typedef struct H5VL_object_class_t {
     hid_t  (*open)  (hid_t loc_id, void *obj_loc, hid_t lapl_id);
-    herr_t (*close) (hid_t obj_id);
     herr_t (*move)  (hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, 
                      const char *dest_name, hid_t lcpl, hid_t lapl);
     herr_t (*copy)  (hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name,
                      hid_t ocpypl_id, hid_t lcpl_id );
     herr_t (*lookup)(hid_t loc_id, H5VL_object_lookup_t lookup_type, int num_args, va_list arguments);
     herr_t (*get)   (hid_t loc_id, H5VL_object_get_t get_type, int num_args, va_list arguments);
+    herr_t (*close) (hid_t obj_id);
 } H5VL_object_class_t;
 
 /* Class information for each VOL driver */