summaryrefslogtreecommitdiff
path: root/viengoos/activity.c
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@gnu.org>2008-11-18 09:45:20 +0100
committerNeal H. Walfield <neal@gnu.org>2008-11-18 09:45:20 +0100
commitb1e2baa8d6b3274a13f2b347f125e43986e80c3a (patch)
treee51edbb7f4a048e0da980b24fa741f21175cb75d /viengoos/activity.c
parent475f219207fc6ffb65005e117f8df4757a24c2d6 (diff)
Only print configuration when destroying the root activity.
2008-11-18 Neal H. Walfield <neal@gnu.org> * activity.c (activity_destroy): Only print configuration when destroying the root activity.
Diffstat (limited to 'viengoos/activity.c')
-rw-r--r--viengoos/activity.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/viengoos/activity.c b/viengoos/activity.c
index 6670670..acd8645 100644
--- a/viengoos/activity.c
+++ b/viengoos/activity.c
@@ -82,22 +82,23 @@ activity_destroy (struct activity *activity, struct activity *victim)
assert (object_type ((struct object *) victim) == cap_activity_control);
profile_stats_dump ();
- debug (0, ""
+
+ /* We should never destroy the root activity. */
+ if (! victim->parent)
+ {
+ assert (victim == root_activity);
+
+ debug (0, ""
#ifdef NCHECK
- "NCHECK "
+ "NCHECK "
#endif
#ifdef NDEBUG
- "NDEBUG "
+ "NDEBUG "
#endif
#ifdef DEBUG_ELIDE
- "DEBUG_ELIDE=%d", DEBUG_ELIDE + 0
+ "DEBUG_ELIDE=%d", DEBUG_ELIDE + 0
#endif
);
-
- /* We should never destroy the root activity. */
- if (! victim->parent)
- {
- assert (victim == root_activity);
panic ("Request to destroy root activity");
}