Fixed previously ignored splintme warnings in loopHeuristics.c

[splint.git] / src / sort.c

diff --git a/src/sort.c b/src/sort.c
index b9b72ac26c678bd788d14b26da58fcac7527c14b..119673872b89ea0c845ee5f2af43c2c3410a68d8 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 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
@@ -17,8 +17,8 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
@@ -35,7 +35,7 @@
 **         Massachusetts Institute of Technology
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "llbasic.h"
 # include "llgrammar.h"
 # include "lclscan.h"
@@ -677,18 +677,16 @@ sort_makePtr (ltoken t, sort baseSort)
 }
 
 sort
-sort_makePtrN (sort s, int pointers)
+sort_makePtrN (sort s, pointers p)
 {
-  llassert (pointers >= 0);
-
-  if (pointers == 0)
+  if (pointers_isUndefined (p))
     {
       return s;
     }
   else
     {
       return sort_makePtrN (sort_makePtr (ltoken_undefined, s), 
-                           pointers - 1);
+                           pointers_getRest (p));
     }
 }
 
@@ -2399,7 +2397,9 @@ sort_dump (FILE *f, bool lco)
        }
       else
        {
-         llcontbug (message ("Invalid sort in sort_dump: sort %d; sortname: %s.  This may result from using .lcs files produced by an old version of LCLint.  Remove the .lcs files, and rerun Splint.",
+         llcontbug (message ("Invalid sort in sort_dump: sort %d; sortname: %s. "
+                             "This may result from using .lcs files produced by an old version of Splint. "
+                             "Remove the .lcs files, and rerun Splint.",
                              i, lsymbol_toString (s->name)));
          fprintf (f, "sort _error_ ");
        }