- library fixes:

[splint.git] / src / message.c

diff --git a/src/message.c b/src/message.c
index 56b29c6194013a8c0ce63c5dcc596634ed356567..41757a5d070f666bab31005f000fa483a4ce7a62 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 University of Virginia,
+** Splint - annotation-assisted static program checker
+** Copyright (C) 1994-2002 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -17,15 +17,15 @@
 ** 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 more information: http://lclint.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
 */
 /*
 ** message.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
  
 /* patch for linux? solaris? */
@@ -37,12 +37,12 @@ typedef enum
 {
   XINVALID, 
   XCHAR, XSTRING, XSTRINGFREE, XTSTRINGFREE, XINT, XFLOAT, XBOOL, XUENTRY,
-  XPERCENT, XCTYPE, XPLURAL, XREPREFIX, XFILELOC
+  XPERCENT, XCTYPE, XPLURAL, XREPREFIX, XFILELOC, XPOINTER
 } ccode;
 
 /* char *s, anytype v */
 /*@notfunction@*/
-# define GETPRINTF(s,v) (sprintf (strbuf, s, v), mstring_copy (strbuf))
+# define GETPRINTF(s,v) (snprintf (strbuf, 64, s, v), mstring_copy (strbuf))
 
 /*
 ** returns control code indicated by *c, and
@@ -99,6 +99,8 @@ static ccode identify_control (char **s)
       return (XBOOL);
     case 't':
       return (XCTYPE);
+    case 'p':
+      return (XPOINTER);
     case 'l':
       return (XFILELOC);
     case '&':
@@ -184,7 +186,7 @@ message (/*@temp@*/ char *fmt, ...)
                if (modcode != 0)
                  {
                    ret = mstring_concatFree (ret, cstring_toCharsSafe 
-                                         (cstring_fill (s, modcode)));
+                                             (cstring_fill (s, size_fromInt (modcode))));
                  }
                else
                  {
@@ -203,7 +205,7 @@ message (/*@temp@*/ char *fmt, ...)
                if (modcode != 0)
                  {
                    ret = mstring_concatFree (ret, cstring_toCharsSafe 
-                                             (cstring_fill (s, modcode)));
+                                             (cstring_fill (s, size_fromInt (modcode))));
                  }
                else
                  {
@@ -234,7 +236,7 @@ message (/*@temp@*/ char *fmt, ...)
              ret = mstring_concatFree (ret, GETPRINTF ("%d", lastint));
              break;
            case XFLOAT:
-             ret = mstring_concatFree (ret, GETPRINTF ("%e", va_arg (pvar, double)));
+             ret = mstring_concatFree (ret, GETPRINTF ("%.2lf", va_arg (pvar, double)));
              break;
            case XBOOL:
              ret = mstring_concatFree1 (ret, cstring_toCharsSafe 
@@ -249,6 +251,10 @@ message (/*@temp@*/ char *fmt, ...)
              ret = mstring_concatFree1 (ret, cstring_toCharsSafe 
                                   (ctype_unparse (va_arg (pvar, ctype)))); 
              break;
+           case XPOINTER:
+             ret = mstring_concatFree (ret, GETPRINTF ("%p", va_arg (pvar, void *)));
+             break;
+
            case XFILELOC:
              ret = mstring_concatFree (ret, cstring_toCharsSafe 
                                   (fileloc_unparse (va_arg (pvar, fileloc))));