1 files changed, 6 insertions, 4 deletions

diff --git a/src/H5G.c b/src/H5G.c
index 7c2dc9c..e929eaf 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -224,18 +224,20 @@ H5G_term_interface(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(H5_interface_initialize_g) {
-        if((n = H5I_nmembers(H5I_GROUP)))
-            H5I_clear_type(H5I_GROUP, FALSE, FALSE);
+        if(H5I_nmembers(H5I_GROUP) > 0) {
+            (void)H5I_clear_type(H5I_GROUP, FALSE, FALSE);
+            n++; /*H5I*/
+        } /* end if */
         else {
             /* Close deprecated interface */
             n += H5G__term_deprec_interface();
 
             /* Destroy the group object id group */
-            H5I_dec_type_ref(H5I_GROUP);
+            (void)H5I_dec_type_ref(H5I_GROUP);
+            n++; /*H5I*/
 
             /* Mark closed */
             H5_interface_initialize_g = 0;
-            n = 1; /*H5I*/
         } /* end else */
     } /* end if */