X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Ftaint.c;h=c655d60a61cf9009fae1043ee9833877625f2704;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=0c4194d524bea593d160239f4caffe39bd99497a;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/libpspp/taint.c b/src/libpspp/taint.c
index 0c4194d5..c655d60a 100644
--- a/src/libpspp/taint.c
+++ b/src/libpspp/taint.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,15 @@
 
 #include <config.h>
 
-#include <libpspp/taint.h>
+#include "libpspp/taint.h"
 
 #include <stddef.h>
 
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* This code maintains two invariants:
 
@@ -79,7 +80,7 @@ taint_create (void)
 struct taint *
 taint_clone (const struct taint *taint_)
 {
-  struct taint *taint = (struct taint *) taint_;
+  struct taint *taint = CONST_CAST (struct taint *, taint_);
 
   assert (taint->ref_cnt > 0);
   taint->ref_cnt++;
@@ -95,26 +96,31 @@ taint_clone (const struct taint *taint_)
 bool
 taint_destroy (struct taint *taint)
 {
-  bool was_tainted = taint_is_tainted (taint);
-  if (--taint->ref_cnt == 0)
+  if ( taint )
     {
-      size_t i, j;
-
-      for (i = 0; i < taint->predecessors.cnt; i++)
-        for (j = 0; j < taint->successors.cnt; j++)
-          taint_propagate (taint->predecessors.taints[i],
-                           taint->successors.taints[j]);
-
-      for (i = 0; i < taint->predecessors.cnt; i++)
-        taint_list_remove (&taint->predecessors.taints[i]->successors, taint);
-      for (i = 0; i < taint->successors.cnt; i++)
-        taint_list_remove (&taint->successors.taints[i]->predecessors, taint);
-
-      taint_list_destroy (&taint->successors);
-      taint_list_destroy (&taint->predecessors);
-      free (taint);
+      bool was_tainted = taint_is_tainted (taint);
+      if (--taint->ref_cnt == 0)
+	{
+	  size_t i, j;
+
+	  for (i = 0; i < taint->predecessors.cnt; i++)
+	    for (j = 0; j < taint->successors.cnt; j++)
+	      taint_propagate (taint->predecessors.taints[i],
+			       taint->successors.taints[j]);
+
+	  for (i = 0; i < taint->predecessors.cnt; i++)
+	    taint_list_remove (&taint->predecessors.taints[i]->successors, taint);
+	  for (i = 0; i < taint->successors.cnt; i++)
+	    taint_list_remove (&taint->successors.taints[i]->predecessors, taint);
+
+	  taint_list_destroy (&taint->successors);
+	  taint_list_destroy (&taint->predecessors);
+	  free (taint);
+	}
+      return !was_tainted;
     }
-  return !was_tainted;
+
+  return true;
 }
 
 /* Adds a propagation relationship from FROM to TO.  This means
@@ -134,8 +140,8 @@ taint_destroy (struct taint *taint)
 void
 taint_propagate (const struct taint *from_, const struct taint *to_)
 {
-  struct taint *from = (struct taint *) from_;
-  struct taint *to = (struct taint *) to_;
+  struct taint *from = CONST_CAST (struct taint *, from_);
+  struct taint *to = CONST_CAST (struct taint *, to_);
 
   if (from != to)
     {
@@ -160,7 +166,7 @@ taint_is_tainted (const struct taint *taint)
 void
 taint_set_taint (const struct taint *taint_)
 {
-  struct taint *taint = (struct taint *) taint_;
+  struct taint *taint = CONST_CAST (struct taint *, taint_);
   if (!taint->tainted)
     recursively_set_taint (taint);
 }
@@ -181,7 +187,7 @@ taint_has_tainted_successor (const struct taint *taint)
 void
 taint_reset_successor_taint (const struct taint *taint_)
 {
-  struct taint *taint = (struct taint *) taint_;
+  struct taint *taint = CONST_CAST (struct taint *, taint_);
 
   if (taint->tainted_successor)
     {