only print out errors on cancel/unset when debugging

1 files changed, 15 insertions, 2 deletions

diff --git a/zwgc/zephyr.c b/zwgc/zephyr.c
index a3ac66d..f8d7389 100644
--- a/zwgc/zephyr.c
+++ b/zwgc/zephyr.c
@@ -35,6 +35,10 @@ static char rcsid_zephyr_c[] = "$Id$";
 #include "variables.h"
 #include "pointer.h"
 
+#ifdef DEBUG
+extern int zwgc_debug;
+#endif /* DEBUG */
+
 /*
  *  Internal Routine:
  *
@@ -219,8 +223,17 @@ void finalize_zephyr() /* <<<>>> */
 	 * Cancel our subscriptions, unset our location, and close our zephyr
 	 * connection:
 	 */
-	TRAP( ZCancelSubscriptions(0), "while canceling subscriptions" );
-	TRAP( ZUnsetLocation(), "while unsetting location" );
+#ifdef DEBUG
+	if (zwgc_debug) {
+	    TRAP( ZCancelSubscriptions(0), "while canceling subscriptions" );
+	    TRAP( ZUnsetLocation(), "while unsetting location" );
+	} else {
+#endif /* DEBUG */
+	    (void) ZCancelSubscriptions(0);
+	    (void) ZUnsetLocation();
+#ifdef DEBUG
+	}
+#endif /* DEBUG */
 	ZClosePort();
     }
     return;