noexpand always false.

[splint.git] / src / qtype.c

diff --git a/src/qtype.c b/src/qtype.c
index 389f0dc1b0b20505c9d60fb1b89b3df617bd0258..beef293460b4cf7affac452e729f2af70c9bdc78 100644 (file)
--- a/src/qtype.c
+++ b/src/qtype.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -67,7 +67,6 @@ qtype qtype_addQual (qtype qt, qual q)
   return qt;
 }
 
-# ifndef NOLCL
 qtype qtype_addQualList (/*@returned@*/ qtype qt, qualList ql)
 {
   if (qtype_isDefined (qt))
@@ -77,7 +76,6 @@ qtype qtype_addQualList (/*@returned@*/ qtype qt, qualList ql)
 
   return qt;
 }
-# endif
 
 static void checkAltQuals (qtype q)
 {
@@ -105,7 +103,6 @@ static void checkAltQuals (qtype q)
     }
 }
 
-# ifndef NOLCL
 qtype qtype_mergeImplicitAlt (/*@returned@*/ qtype q1, /*@only@*/ qtype q2)
 {
   if (qtype_isDefined (q1) && qtype_isDefined (q2))
@@ -121,7 +118,6 @@ qtype qtype_mergeImplicitAlt (/*@returned@*/ qtype q1, /*@only@*/ qtype q2)
   qtype_free (q2);
   return q1;
 }
-# endif
 
 qtype qtype_mergeAlt (/*@returned@*/ qtype q1, /*@only@*/ qtype q2)
 {
@@ -210,15 +206,17 @@ qtype qtype_newQbase (qtype q1, qtype q2)
   return q1;
 }
 
-void qtype_adjustPointers (int n, qtype q)
+void qtype_adjustPointers (pointers n, qtype q)
 {
   if (qtype_isDefined (q))
     {
+      DPRINTF (("Pointers: %s %s", pointers_unparse (n), qtype_unparse (q)));
       q->type = ctype_adjustPointers (n, q->type);
     }
+
+  pointers_free (n);
 }
 
-# ifndef NOLCL
 qtype qtype_copy (qtype q)
 {
   if (qtype_isDefined (q))
@@ -234,4 +232,3 @@ qtype qtype_copy (qtype q)
       return qtype_undefined;
     }
 }
-# endif