unrecognizeddirective->unrecogdirective

[splint.git] / src / message.c

diff --git a/src/message.c b/src/message.c
index 53fe670a138d8d9f6703522c9e760073573c9e35..45fa6fec9e0233dd76563a70fafa272d634c03ed 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2000 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
@@ -19,7 +19,7 @@
 **
 ** 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 more information: http://www.splint.org
 */
 /*
 ** message.c
@@ -37,7 +37,7 @@ 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 */
@@ -49,8 +49,7 @@ typedef enum
 ** advances *c to next character.
 */
 
-static ccode
-  identify_control (char **s)
+static ccode identify_control (char **s)
 {
   char c;
 
@@ -64,7 +63,7 @@ static ccode
 
   if (c >= '0' && c <= '9')
     {
-      modcode = getInt (s);
+      modcode = reader_getInt (s);
     }
 
   c = **s;
@@ -100,9 +99,11 @@ static ccode
       return (XBOOL);
     case 't':
       return (XCTYPE);
+    case 'p':
+      return (XPOINTER);
     case 'l':
       return (XFILELOC);
-    case 'p':
+    case '&':
       return (XPLURAL);
     case 'r':
       return (XREPREFIX);
@@ -250,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))));