[svn-r7295] Purpose:

    Code cleanup

Description:
    Removed unused and out of date H5E flags

Platforms tested:
    h5committested

4 files changed, 3 insertions, 96 deletions

diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index e5601b9..14b44ef 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -163,7 +163,6 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  * Name:              h5init_flags_c
  * Purpose:           Initialize Fortran flags
  * Inputs:            h5d_flags    - H5D inteface flags 
- *                    h5e_flags    - H5E interface flags
  *                    h5f_flags    - H5F interface flags
  *                    h5fd_flags    - H5FD interface flags
  *                    h5g_flags    - H5G interface flags
@@ -181,7 +180,7 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *                    Added more FD flags and new H5LIB flags
  *---------------------------------------------------------------------------*/
 int_f
-nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, int_f *h5f_flags,
+nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
                  int_f *h5fd_flags, int_f *h5g_flags, int_f *h5i_flags,
                  int_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
                  int_f *h5t_flags, int_f *h5z_flags)
@@ -211,35 +210,6 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, int_f *h5f_flags,
     h5d_flags[18] = H5D_FILL_VALUE_USER_DEFINED;
 
 /*
- *  H5E flags
- */
-    
-      h5e_flags[0] = H5E_NONE_MAJOR;
-      h5e_flags[1] = H5E_ARGS;
-      h5e_flags[2] = H5E_RESOURCE;
-      h5e_flags[3] = H5E_INTERNAL;
-      h5e_flags[4] = H5E_FILE;
-      h5e_flags[5] = H5E_IO;
-      h5e_flags[6] = H5E_FUNC;
-      h5e_flags[7] = H5E_ATOM;
-      h5e_flags[8] = H5E_CACHE;
-      h5e_flags[9] = H5E_BTREE;
-      h5e_flags[10] = H5E_SYM;
-      h5e_flags[11] = H5E_HEAP;
-      h5e_flags[12] = H5E_OHDR;
-      h5e_flags[13] = H5E_DATATYPE;
-      h5e_flags[14] = H5E_DATASPACE;
-      h5e_flags[15] = H5E_DATASET;
-      h5e_flags[16] = H5E_STORAGE;
-      h5e_flags[17] = H5E_PLIST;
-      h5e_flags[18] = H5E_ATTR;
-      h5e_flags[19] = H5E_PLINE;
-      h5e_flags[20] = H5E_EFL;
-      h5e_flags[21] = H5E_REFERENCE;
-      h5e_flags[22] = H5E_VFL;
-      h5e_flags[23] = H5E_TBBT;
-    
-/*
  *  H5F flags
  */
       h5f_flags[0] = (int_f)H5F_ACC_RDWR; 
diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90
index 2bdf83b..02d2f25 100644
--- a/fortran/src/H5_ff.f90
+++ b/fortran/src/H5_ff.f90
@@ -77,7 +77,6 @@
         END INTERFACE
         INTERFACE
           INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
-                                i_H5E_flags, &
                                 i_H5F_flags, &
                                 i_H5FD_flags, &
                                 i_H5G_flags, &
@@ -92,7 +91,6 @@
           INTEGER i_H5G_flags(H5G_FLAGS_LEN)
           INTEGER i_H5D_flags(H5D_FLAGS_LEN)
           INTEGER i_H5FD_flags(H5FD_FLAGS_LEN)
-          INTEGER i_H5E_flags(H5E_FLAGS_LEN)
           INTEGER i_H5I_flags(H5I_FLAGS_LEN)
           INTEGER i_H5P_flags(H5P_FLAGS_LEN)
           INTEGER i_H5R_flags(H5R_FLAGS_LEN)
@@ -116,7 +114,6 @@
         error_0 = h5open_c()
         error_1 = h5init_types_c(predef_types, floating_types, integer_types)
         error_2 = h5init_flags_c(H5D_flags, &
-                                H5E_flags, &
                                 H5F_flags, &
                                 H5FD_flags, &
                                 H5G_flags, &
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 72c1148..8145c36 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -313,67 +313,7 @@
       EQUIVALENCE(H5FD_flags(11), H5FD_MEM_NTYPES_F)
 
 !
-! H5E flags declaration
-!
-      INTEGER, PARAMETER :: H5E_FLAGS_LEN = 24
-      INTEGER H5E_flags(H5E_FLAGS_LEN)
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$ ATTRIBUTES DLLEXPORT :: /H5E_FLAGS/
-!DEC$endif
-      COMMON /H5E_FLAGS/ H5E_flags
-
-      INTEGER ::  H5E_NONE_MAJOR_F 
-      INTEGER ::  H5E_ARGS_F 
-      INTEGER ::  H5E_RESOURCE_F 
-      INTEGER ::  H5E_INTERNAL_F 
-      INTEGER ::  H5E_FILE_F 
-      INTEGER ::  H5E_IO_F 
-      INTEGER ::  H5E_FUNC_F 
-      INTEGER ::  H5E_ATOM_F 
-      INTEGER ::  H5E_CACHE_F 
-      INTEGER ::  H5E_BTREE_F 
-      INTEGER ::  H5E_SYM_F 
-      INTEGER ::  H5E_HEAP_F 
-      INTEGER ::  H5E_OHDR_F 
-      INTEGER ::  H5E_DATATYPE_F 
-      INTEGER ::  H5E_DATASPACE_F 
-      INTEGER ::  H5E_DATASET_F 
-      INTEGER ::  H5E_STORAGE_F 
-      INTEGER ::  H5E_PLIST_F 
-      INTEGER ::  H5E_ATTR_F 
-      INTEGER ::  H5E_PLINE_F 
-      INTEGER ::  H5E_EFL_F 
-      INTEGER ::  H5E_REFERENCE_F
-      INTEGER ::  H5E_VFL_F 
-      INTEGER ::  H5E_TBBT_F 
-
-      EQUIVALENCE(H5E_flags(1), H5E_NONE_MAJOR_F)
-      EQUIVALENCE(H5E_flags(2), H5E_ARGS_F)
-      EQUIVALENCE(H5E_flags(3), H5E_RESOURCE_F)
-      EQUIVALENCE(H5E_flags(4), H5E_INTERNAL_F)
-      EQUIVALENCE(H5E_flags(5), H5E_FILE_F)
-      EQUIVALENCE(H5E_flags(6), H5E_IO_F)
-      EQUIVALENCE(H5E_flags(7), H5E_FUNC_F)
-      EQUIVALENCE(H5E_flags(8), H5E_ATOM_F)
-      EQUIVALENCE(H5E_flags(9), H5E_CACHE_F)
-      EQUIVALENCE(H5E_flags(10), H5E_BTREE_F)
-      EQUIVALENCE(H5E_flags(11), H5E_SYM_F)
-      EQUIVALENCE(H5E_flags(12), H5E_HEAP_F)
-      EQUIVALENCE(H5E_flags(13), H5E_OHDR_F)
-      EQUIVALENCE(H5E_flags(14), H5E_DATATYPE_F)
-      EQUIVALENCE(H5E_flags(15), H5E_DATASPACE_F)
-      EQUIVALENCE(H5E_flags(16), H5E_DATASET_F)
-      EQUIVALENCE(H5E_flags(17), H5E_STORAGE_F)
-      EQUIVALENCE(H5E_flags(18), H5E_PLIST_F)
-      EQUIVALENCE(H5E_flags(19), H5E_ATTR_F)
-      EQUIVALENCE(H5E_flags(20), H5E_PLINE_F)
-      EQUIVALENCE(H5E_flags(21), H5E_EFL_F)
-      EQUIVALENCE(H5E_flags(22), H5E_REFERENCE_F)
-      EQUIVALENCE(H5E_flags(23), H5E_VFL_F)
-      EQUIVALENCE(H5E_flags(24), H5E_TBBT_F)
-
-!
-! H5E flags declaration
+! H5I flags declaration
 !
       INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
       INTEGER H5I_flags(H5I_FLAGS_LEN)
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 1caa464..a9650ac 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1249,7 +1249,7 @@ H5_DLL int_f nh5close_c(void);
 H5_DLL int_f nh5init_types_c(hid_t_f *types, hid_t_f * floatingtypes, hid_t_f * integertypes);
 H5_DLL int_f nh5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f * floatingtypes, int_f * floatinglen, hid_t_f * integertypes,  int_f * integerlen);
  
-H5_DLL int_f nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, int_f *h5f_flags,
+H5_DLL int_f nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
                               int_f *h5fd_flags, int_f *h5g_flags, int_f *h5i_flags,
                               int_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
                               int_f *h5t_flags, int_f *h5z_flags);