/*
** 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
** 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
*/
/*
** message.c
*/
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
# include "basic.h"
/* patch for linux? solaris? */
XPERCENT, XCTYPE, XPLURAL, XREPREFIX, XFILELOC, XPOINTER
} ccode;
-/* char *s, anytype v */
+/*@function void GETPRINTF (char *p_s, anytype p_v) modifies strbuf@*/
+
/*@notfunction@*/
-# define GETPRINTF(s,v) (sprintf (strbuf, s, v), mstring_copy (strbuf))
+# ifndef WIN32
+ /* ISO requires this, but not all implementations (e.g., Microsoft's) provide it */
+# define GETPRINTF(s,v) (snprintf (strbuf, 64, s, v), mstring_copy (strbuf))
+# else
+ /* MS provides _snprintf instead */
+# define GETPRINTF(s,v) (_snprintf (strbuf, 64, s, v), mstring_copy (strbuf))
+# endif
/*
** returns control code indicated by *c, and
if (modcode != 0)
{
ret = mstring_concatFree (ret, cstring_toCharsSafe
- (cstring_fill (s, modcode)));
+ (cstring_fill (s, size_fromInt (modcode))));
}
else
{
if (modcode != 0)
{
ret = mstring_concatFree (ret, cstring_toCharsSafe
- (cstring_fill (s, modcode)));
+ (cstring_fill (s, size_fromInt (modcode))));
}
else
{
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
- (bool_unparse (va_arg (pvar, bool))));
+ ret = mstring_concatFree1
+ (ret, cstring_toCharsSafe
+ (bool_unparse (bool_fromInt ((va_arg (pvar, int))))));
+ /* va_arg should not use bool type */
break;
case XUENTRY:
ret = mstring_concatFree (ret, cstring_toCharsSafe