Removes unused definitions from module headers (#1624)

38 files changed, 76 insertions, 115 deletions

diff --git a/src/H5ACmodule.h b/src/H5ACmodule.h
index d1f9697..a7f9a27 100644
--- a/src/H5ACmodule.h
+++ b/src/H5ACmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5AC_MODULE
-#define H5_MY_PKG      H5AC
-#define H5_MY_PKG_ERR  H5E_CACHE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5AC
+#define H5_MY_PKG_ERR H5E_CACHE
 
 #endif /* H5ACmodule_H */
diff --git a/src/H5Amodule.h b/src/H5Amodule.h
index 9f86ddd..3586414 100644
--- a/src/H5Amodule.h
+++ b/src/H5Amodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5A_MODULE
-#define H5_MY_PKG      H5A
-#define H5_MY_PKG_ERR  H5E_ATTR
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5A
+#define H5_MY_PKG_ERR H5E_ATTR
 
 /**\defgroup H5A H5A
  *
diff --git a/src/H5B2module.h b/src/H5B2module.h
index aa0e163..6a3131b 100644
--- a/src/H5B2module.h
+++ b/src/H5B2module.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5B2_MODULE
-#define H5_MY_PKG      H5B2
-#define H5_MY_PKG_ERR  H5E_BTREE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5B2
+#define H5_MY_PKG_ERR H5E_BTREE
 
 #endif /* H5B2module_H */
diff --git a/src/H5Bmodule.h b/src/H5Bmodule.h
index cfd3d53..9c0f73b 100644
--- a/src/H5Bmodule.h
+++ b/src/H5Bmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5B_MODULE
-#define H5_MY_PKG      H5B
-#define H5_MY_PKG_ERR  H5E_BTREE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5B
+#define H5_MY_PKG_ERR H5E_BTREE
 
 #endif /* H5Bmodule_H */
diff --git a/src/H5CXmodule.h b/src/H5CXmodule.h
index 9fbaab4..f9844a1 100644
--- a/src/H5CXmodule.h
+++ b/src/H5CXmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5CX_MODULE
-#define H5_MY_PKG      H5CX
-#define H5_MY_PKG_ERR  H5E_CONTEXT
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5CX
+#define H5_MY_PKG_ERR H5E_CONTEXT
 
 #endif /* H5CXmodule_H */
diff --git a/src/H5Cmodule.h b/src/H5Cmodule.h
index 26216ec..a3ef4d6 100644
--- a/src/H5Cmodule.h
+++ b/src/H5Cmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5C_MODULE
-#define H5_MY_PKG      H5C
-#define H5_MY_PKG_ERR  H5E_CACHE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5C
+#define H5_MY_PKG_ERR H5E_CACHE
 
 #endif /* H5Cmodule_H */
diff --git a/src/H5Dmodule.h b/src/H5Dmodule.h
index 596fd48..a05d717 100644
--- a/src/H5Dmodule.h
+++ b/src/H5Dmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5D_MODULE
-#define H5_MY_PKG      H5D
-#define H5_MY_PKG_ERR  H5E_DATASET
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5D
+#define H5_MY_PKG_ERR H5E_DATASET
 
 /**\defgroup H5D H5D
  *
diff --git a/src/H5EAmodule.h b/src/H5EAmodule.h
index 1833e40..bba2a99 100644
--- a/src/H5EAmodule.h
+++ b/src/H5EAmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5EA_MODULE
-#define H5_MY_PKG      H5EA
-#define H5_MY_PKG_ERR  H5E_EARRAY
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5EA
+#define H5_MY_PKG_ERR H5E_EARRAY
 
 #endif /* H5EAmodule_H */
diff --git a/src/H5ESmodule.h b/src/H5ESmodule.h
index 5169b52..205089a 100644
--- a/src/H5ESmodule.h
+++ b/src/H5ESmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5ES_MODULE
-#define H5_MY_PKG      H5ES
-#define H5_MY_PKG_ERR  H5E_EVENTSET
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5ES
+#define H5_MY_PKG_ERR H5E_EVENTSET
 
 /**\defgroup H5ES H5ES
  *
diff --git a/src/H5Emodule.h b/src/H5Emodule.h
index 58a3517..a2d59f3 100644
--- a/src/H5Emodule.h
+++ b/src/H5Emodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5E_MODULE
-#define H5_MY_PKG      H5E
-#define H5_MY_PKG_ERR  H5E_ERROR
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5E
+#define H5_MY_PKG_ERR H5E_ERROR
 
 /**\defgroup H5E H5E
  *
diff --git a/src/H5FAmodule.h b/src/H5FAmodule.h
index ef814ae..3fbdb90 100644
--- a/src/H5FAmodule.h
+++ b/src/H5FAmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5FA_MODULE
-#define H5_MY_PKG      H5FA
-#define H5_MY_PKG_ERR  H5E_FARRAY
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5FA
+#define H5_MY_PKG_ERR H5E_FARRAY
 
 #endif /* H5FAmodule_H */
diff --git a/src/H5FDdrvr_module.h b/src/H5FDdrvr_module.h
index 1d20fce..4a7a4d1 100644
--- a/src/H5FDdrvr_module.h
+++ b/src/H5FDdrvr_module.h
@@ -24,9 +24,7 @@
 /* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
  *      reporting macros.
  */
-#define H5_MY_PKG      H5FD
-#define H5_MY_PKG_ERR  H5E_FILE
-#define H5_MY_PKG_INIT YES
-#define H5_PKG_SINGLE_SOURCE
+#define H5_MY_PKG     H5FD
+#define H5_MY_PKG_ERR H5E_FILE
 
 #endif /* H5FDdrvr_module_H */
diff --git a/src/H5FDmodule.h b/src/H5FDmodule.h
index 0b92b27..728b4b8 100644
--- a/src/H5FDmodule.h
+++ b/src/H5FDmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5FD_MODULE
-#define H5_MY_PKG      H5FD
-#define H5_MY_PKG_ERR  H5E_VFL
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5FD
+#define H5_MY_PKG_ERR H5E_VFL
 
 #endif /* H5FDmodule_H */
diff --git a/src/H5FLmodule.h b/src/H5FLmodule.h
index 95c0b49..0485603 100644
--- a/src/H5FLmodule.h
+++ b/src/H5FLmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5FL_MODULE
-#define H5_MY_PKG      H5FL
-#define H5_MY_PKG_ERR  H5E_RESOURCE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5FL
+#define H5_MY_PKG_ERR H5E_RESOURCE
 
 #endif /* H5FLmodule_H */
diff --git a/src/H5FSmodule.h b/src/H5FSmodule.h
index a40c103..841b8fd 100644
--- a/src/H5FSmodule.h
+++ b/src/H5FSmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5FS_MODULE
-#define H5_MY_PKG      H5FS
-#define H5_MY_PKG_ERR  H5E_FSPACE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5FS
+#define H5_MY_PKG_ERR H5E_FSPACE
 
 #endif /* H5FSmodule_H */
diff --git a/src/H5Fmodule.h b/src/H5Fmodule.h
index 81c1ede..6047693 100644
--- a/src/H5Fmodule.h
+++ b/src/H5Fmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5F_MODULE
-#define H5_MY_PKG      H5F
-#define H5_MY_PKG_ERR  H5E_FILE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5F
+#define H5_MY_PKG_ERR H5E_FILE
 
 /**\defgroup H5F H5F
  *
diff --git a/src/H5Gmodule.h b/src/H5Gmodule.h
index a0e121d..93e7184 100644
--- a/src/H5Gmodule.h
+++ b/src/H5Gmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5G_MODULE
-#define H5_MY_PKG      H5G
-#define H5_MY_PKG_ERR  H5E_SYM
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5G
+#define H5_MY_PKG_ERR H5E_SYM
 
 /** \defgroup H5G H5G
  *
diff --git a/src/H5HFmodule.h b/src/H5HFmodule.h
index 7fab611..818c3d4 100644
--- a/src/H5HFmodule.h
+++ b/src/H5HFmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5HF_MODULE
-#define H5_MY_PKG      H5HF
-#define H5_MY_PKG_ERR  H5E_HEAP
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5HF
+#define H5_MY_PKG_ERR H5E_HEAP
 
 #endif /* H5HFmodule_H */
diff --git a/src/H5HGmodule.h b/src/H5HGmodule.h
index a75dea5..412223e 100644
--- a/src/H5HGmodule.h
+++ b/src/H5HGmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5HG_MODULE
-#define H5_MY_PKG      H5HG
-#define H5_MY_PKG_ERR  H5E_HEAP
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5HG
+#define H5_MY_PKG_ERR H5E_HEAP
 
 #endif /* H5HGmodule_H */
diff --git a/src/H5HLmodule.h b/src/H5HLmodule.h
index 3004809..5432f1a 100644
--- a/src/H5HLmodule.h
+++ b/src/H5HLmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5HL_MODULE
-#define H5_MY_PKG      H5HL
-#define H5_MY_PKG_ERR  H5E_HEAP
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5HL
+#define H5_MY_PKG_ERR H5E_HEAP
 
 #endif /* H5HLmodule_H */
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index 0ba3b1c..5ee9aee 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -51,9 +51,8 @@ H5FL_BLK_EXTERN(lheap_chunk);
  *      error reporting macros.
  */
 #ifdef H5HL_PACKAGE
-#define H5_MY_PKG      H5HL
-#define H5_MY_PKG_ERR  H5E_HEAP
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5HL
+#define H5_MY_PKG_ERR H5E_HEAP
 #endif
 
 #define H5HL_SIZEOF_HDR(F)                                                                                   \
diff --git a/src/H5Imodule.h b/src/H5Imodule.h
index 08f8bb0..cd1cbcd 100644
--- a/src/H5Imodule.h
+++ b/src/H5Imodule.h
@@ -25,9 +25,8 @@
  * reporting macros.
  */
 #define H5I_MODULE
-#define H5_MY_PKG      H5I
-#define H5_MY_PKG_ERR  H5E_ID
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5I
+#define H5_MY_PKG_ERR H5E_ID
 
 /**\defgroup H5I H5I
  *
diff --git a/src/H5Lmodule.h b/src/H5Lmodule.h
index cffd25c..d52690e 100644
--- a/src/H5Lmodule.h
+++ b/src/H5Lmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5L_MODULE
-#define H5_MY_PKG      H5L
-#define H5_MY_PKG_ERR  H5E_LINK
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5L
+#define H5_MY_PKG_ERR H5E_LINK
 
 /**\defgroup H5L H5L
  *
diff --git a/src/H5MFmodule.h b/src/H5MFmodule.h
index 9726cec..3e806c6 100644
--- a/src/H5MFmodule.h
+++ b/src/H5MFmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5MF_MODULE
-#define H5_MY_PKG      H5MF
-#define H5_MY_PKG_ERR  H5E_RESOURCE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5MF
+#define H5_MY_PKG_ERR H5E_RESOURCE
 
 #endif /* H5MFmodule_H */
diff --git a/src/H5Mmodule.h b/src/H5Mmodule.h
index 848f63f..e8d7c89 100644
--- a/src/H5Mmodule.h
+++ b/src/H5Mmodule.h
@@ -22,9 +22,8 @@
  *      reporting macros.
  */
 #define H5M_MODULE
-#define H5_MY_PKG      H5M
-#define H5_MY_PKG_ERR  H5E_MAP
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5M
+#define H5_MY_PKG_ERR H5E_MAP
 
 /**\defgroup H5M H5M
  *
diff --git a/src/H5Omodule.h b/src/H5Omodule.h
index 8afba29..18e329c 100644
--- a/src/H5Omodule.h
+++ b/src/H5Omodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5O_MODULE
-#define H5_MY_PKG      H5O
-#define H5_MY_PKG_ERR  H5E_OHDR
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5O
+#define H5_MY_PKG_ERR H5E_OHDR
 
 /**\defgroup H5O H5O
  *
diff --git a/src/H5PBmodule.h b/src/H5PBmodule.h
index 21294c8..39db5d9 100644
--- a/src/H5PBmodule.h
+++ b/src/H5PBmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5PB_MODULE
-#define H5_MY_PKG      H5PB
-#define H5_MY_PKG_ERR  H5E_RESOURCE
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5PB
+#define H5_MY_PKG_ERR H5E_RESOURCE
 
 #endif /* H5PBmodule_H */
diff --git a/src/H5PLmodule.h b/src/H5PLmodule.h
index a093096..4751a48 100644
--- a/src/H5PLmodule.h
+++ b/src/H5PLmodule.h
@@ -23,9 +23,8 @@
  *      reporting macros.
  */
 #define H5PL_MODULE
-#define H5_MY_PKG      H5PL
-#define H5_MY_PKG_ERR  H5E_PLUGIN
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5PL
+#define H5_MY_PKG_ERR H5E_PLUGIN
 
 /**\defgroup H5PL H5PL
  *
diff --git a/src/H5Pmodule.h b/src/H5Pmodule.h
index 66a9574..d771e6e 100644
--- a/src/H5Pmodule.h
+++ b/src/H5Pmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5P_MODULE
-#define H5_MY_PKG      H5P
-#define H5_MY_PKG_ERR  H5E_PLIST
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5P
+#define H5_MY_PKG_ERR H5E_PLIST
 
 /**\defgroup H5P H5P
  *
diff --git a/src/H5RSmodule.h b/src/H5RSmodule.h
index 17977c7..8cd0333 100644
--- a/src/H5RSmodule.h
+++ b/src/H5RSmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5RS_MODULE
-#define H5_MY_PKG      H5RS
-#define H5_MY_PKG_ERR  H5E_RS
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5RS
+#define H5_MY_PKG_ERR H5E_RS
 
 #endif /* H5RSmodule_H */
diff --git a/src/H5Rmodule.h b/src/H5Rmodule.h
index fe28bb2..d9ab968 100644
--- a/src/H5Rmodule.h
+++ b/src/H5Rmodule.h
@@ -21,9 +21,8 @@
  *      reporting macros.
  */
 #define H5R_MODULE
-#define H5_MY_PKG      H5R
-#define H5_MY_PKG_ERR  H5E_REFERENCE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5R
+#define H5_MY_PKG_ERR H5E_REFERENCE
 
 /**
  * \defgroup H5R H5R
diff --git a/src/H5SLmodule.h b/src/H5SLmodule.h
index 2614f92..606fa90 100644
--- a/src/H5SLmodule.h
+++ b/src/H5SLmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5SL_MODULE
-#define H5_MY_PKG      H5SL
-#define H5_MY_PKG_ERR  H5E_SLIST
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5SL
+#define H5_MY_PKG_ERR H5E_SLIST
 
 #endif /* H5SLmodule_H */
diff --git a/src/H5SMmodule.h b/src/H5SMmodule.h
index 6d2abf1..6308e14 100644
--- a/src/H5SMmodule.h
+++ b/src/H5SMmodule.h
@@ -25,8 +25,7 @@
  *      reporting macros.
  */
 #define H5SM_MODULE
-#define H5_MY_PKG      H5SM
-#define H5_MY_PKG_ERR  H5E_SOHM
-#define H5_MY_PKG_INIT NO
+#define H5_MY_PKG     H5SM
+#define H5_MY_PKG_ERR H5E_SOHM
 
 #endif /* H5SMmodule_H */
diff --git a/src/H5Smodule.h b/src/H5Smodule.h
index 010f4a6..72d722a 100644
--- a/src/H5Smodule.h
+++ b/src/H5Smodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5S_MODULE
-#define H5_MY_PKG      H5S
-#define H5_MY_PKG_ERR  H5E_DATASPACE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5S
+#define H5_MY_PKG_ERR H5E_DATASPACE
 
 /**\defgroup H5S H5S
  *
diff --git a/src/H5Tmodule.h b/src/H5Tmodule.h
index 73424fb..dc07e03 100644
--- a/src/H5Tmodule.h
+++ b/src/H5Tmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5T_MODULE
-#define H5_MY_PKG      H5T
-#define H5_MY_PKG_ERR  H5E_DATATYPE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5T
+#define H5_MY_PKG_ERR H5E_DATATYPE
 
 /**\defgroup H5T H5T
  *
diff --git a/src/H5VLmodule.h b/src/H5VLmodule.h
index 8fcb961..4ea4992 100644
--- a/src/H5VLmodule.h
+++ b/src/H5VLmodule.h
@@ -23,9 +23,8 @@
  *      reporting macros.
  */
 #define H5VL_MODULE
-#define H5_MY_PKG      H5VL
-#define H5_MY_PKG_ERR  H5E_VOL
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5VL
+#define H5_MY_PKG_ERR H5E_VOL
 
 /**\defgroup H5VL H5VL
  *
diff --git a/src/H5Zmodule.h b/src/H5Zmodule.h
index 9312b72..338242e 100644
--- a/src/H5Zmodule.h
+++ b/src/H5Zmodule.h
@@ -25,9 +25,8 @@
  *      reporting macros.
  */
 #define H5Z_MODULE
-#define H5_MY_PKG      H5Z
-#define H5_MY_PKG_ERR  H5E_PLINE
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5Z
+#define H5_MY_PKG_ERR H5E_PLINE
 
 /**\defgroup H5Z H5Z
  *
diff --git a/src/H5module.h b/src/H5module.h
index f7d3cd6..642683f 100644
--- a/src/H5module.h
+++ b/src/H5module.h
@@ -22,9 +22,8 @@
  *      reporting macros.
  */
 #define H5_MODULE
-#define H5_MY_PKG      H5
-#define H5_MY_PKG_ERR  H5E_LIB
-#define H5_MY_PKG_INIT YES
+#define H5_MY_PKG     H5
+#define H5_MY_PKG_ERR H5E_LIB
 
 /**\defgroup H5 H5
  *