Splint fiddles.

CVS patchset: 7530
CVS date: 2004/10/31 09:24:19

5 files changed, 41 insertions, 27 deletions

diff --git a/expat/lib/.splintrc b/expat/lib/.splintrc
index c983d9ac0..a52077b4a 100644
--- a/expat/lib/.splintrc
+++ b/expat/lib/.splintrc
@@ -3,7 +3,6 @@
 +partial
 +forcehints
 
-#-warnunixlib
 -warnposix
 
 +unixlib
@@ -34,12 +33,12 @@
 -evalorder		# 5
 -fullinitblock		# 14
 -infloops		# 20
--modnomods		# ? error
+-modnomods		# 238
 -modunconnomods		# 2
 -noeffectuncon		# 94
 -nullderef		# 8
 -nullpass		# 11
--nullstate		# 171
+-nullstate		# 156
 -paramuse		# 146
 -predboolptr		# 177
 -protoparammatch	# 26
@@ -50,10 +49,11 @@
 -type			# 59
 -usereleased		# 8
 
--immediatetrans		# 9
+-dependenttrans		# 1
 -kepttrans		# 5
--temptrans		# 51
--unqualifiedtrans	# 12
+-observertrans		# 2
+-temptrans		# 49
+-unqualifiedtrans	# 11
 
 -casebreak		# 2
 -ifempty
@@ -66,26 +66,26 @@
 -whileempty
 
 # --- not-yet at strict level
--bitwisesigned		# 86
--elseifcomplete		# 2
--forblock		# 6
--ifblock		# 231
--incondefs		# 64
--namechecks		# tedious ANSI compliance checks
--ptrarith		# tedious
+-bitwisesigned
+-elseifcomplete
+-forblock
+-ifblock
+-incondefs
+-namechecks
+-ptrarith
 
--mustdefine		# 25
--shiftimplementation	# 148 ctype.h
+-mustdefine
+-shiftimplementation
 
--strictops		# 37
--whileblock		# 16
+-strictops
+-whileblock
 
 # --- not-yet at checks level
--mustfree		# 26
--usedef			# 31
+-mustfree
+-usedef
 
 # --- not-yet at standard level
-+boolint		# 38
-+charint		# 147
-+ignorequals		# 49
-+matchanyintegral	# 77
++boolint
++charint
++ignorequals
++matchanyintegral
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index be677157a..24d6f76ec 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -230,7 +230,7 @@ typedef struct {
    an attribute has been specified. */
 typedef struct attribute_id {
   XML_Char *name;
-/*@null@*/
+/*@null@*/ /*@observer@*/
   PREFIX *prefix;
   XML_Bool maybeTokenized;
   XML_Bool xmlns;
@@ -290,6 +290,7 @@ typedef struct {
 typedef struct open_internal_entity {
   const char *internalEventPtr;
   const char *internalEventEndPtr;
+/*@observer@*/
   struct open_internal_entity *next;
   ENTITY *entity;
 } OPEN_INTERNAL_ENTITY;
@@ -530,7 +531,9 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
 struct XML_ParserStruct {
   /* The first member must be userData so that the XML_GetUserData
      macro works. */
+/*@relnull@*/
   void *m_userData;
+/*@relnull@*/
   void *m_handlerArg;
 /*@null@*/ /*@owned@*/
   char *m_buffer;
@@ -576,7 +579,9 @@ struct XML_ParserStruct {
   XML_XmlDeclHandler m_xmlDeclHandler;
   const ENCODING *m_encoding;
   INIT_ENCODING m_initEncoding;
+/*@observer@*/
   const ENCODING *m_internalEncoding;
+/*@relnull@*/
   const XML_Char *m_protocolEncodingName;
   XML_Bool m_ns;
   XML_Bool m_ns_triplets;
@@ -593,6 +598,7 @@ struct XML_ParserStruct {
   const char *m_eventEndPtr;
 /*@dependent@*/
   const char *m_positionPtr;
+/*@observer@*/
   OPEN_INTERNAL_ENTITY *m_openInternalEntities;
   XML_Bool m_defaultExpandInternalEntities;
   int m_tagLevel;
@@ -610,6 +616,7 @@ struct XML_ParserStruct {
   XML_Bool m_declAttributeIsCdata;
   XML_Bool m_declAttributeIsId;
   DTD *m_dtd;
+/*@relnull@*/
   const XML_Char *m_curBase;
   TAG *m_tagStack;
 /*@null@*/
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 11904a576..24d5e6463 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -325,6 +325,7 @@ static void PTRCALL
 utf8_toUtf8(const ENCODING *enc,
             const char **fromP, const char *fromLim,
             char **toP, const char *toLim)
+	/*@modifies *fromP, *toP @*/
 {
   char *to;
   const char *from;
@@ -344,6 +345,7 @@ static void PTRCALL
 utf8_toUtf16(const ENCODING *enc,
              const char **fromP, const char *fromLim,
              unsigned short **toP, const unsigned short *toLim)
+	/*@modifies *fromP, *toP @*/
 {
   unsigned short *to = *toP;
   const char *from = *fromP;
diff --git a/expat/lib/xmltok.h b/expat/lib/xmltok.h
index 5e3fe04d4..5b0cf6b47 100644
--- a/expat/lib/xmltok.h
+++ b/expat/lib/xmltok.h
@@ -290,8 +290,10 @@ int XmlParseXmlDecl(int isGeneralTextEntity,
 
 int XmlInitEncoding(INIT_ENCODING *p, const ENCODING **encPtr, const char *name)
 	/*@modifies p, *encPtr @*/;
+/*@observer@*/
 const ENCODING *XmlGetUtf8InternalEncoding(void)
 	/*@*/;
+/*@observer@*/
 const ENCODING *XmlGetUtf16InternalEncoding(void)
 	/*@*/;
 int FASTCALL XmlUtf8Encode(int charNumber, char *buf)
@@ -304,7 +306,7 @@ int XmlSizeOfUnknownEncoding(void)
 typedef int (*CONVERTER)(void *userData, const char *p)
 	/*@*/;
 
-/*@null@*/
+/*@null@*//*@observer@*/
 ENCODING *
 XmlInitUnknownEncoding(void *mem,
                        int *table,
@@ -328,8 +330,10 @@ int XmlParseXmlDeclNS(int isGeneralTextEntity,
 int XmlInitEncodingNS(INIT_ENCODING *p, const ENCODING **encPtr,
 		const char *name)
 	/*@modifies p, *encPtr @*/;
+/*@observer@*/
 const ENCODING *XmlGetUtf8InternalEncodingNS(void)
 	/*@*/;
+/*@observer@*/
 const ENCODING *XmlGetUtf16InternalEncodingNS(void)
 	/*@*/;
 /*@null@*/
@@ -337,7 +341,8 @@ ENCODING *
 XmlInitUnknownEncodingNS(void *mem,
                          int *table,
                          CONVERTER convert,
-                         void *userData);
+                         void *userData)
+	/*@modifies mem @*/;
 #ifdef __cplusplus
 }
 #endif
diff --git a/expat/lib/xmltok_ns.c b/expat/lib/xmltok_ns.c
index 38fc06988..624810e13 100644
--- a/expat/lib/xmltok_ns.c
+++ b/expat/lib/xmltok_ns.c
@@ -64,7 +64,7 @@ NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr,
   return 1;
 }
 
-/*@null@*/
+/*@null@*/ /*@observer@*/
 static const ENCODING *
 NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end)
 	/*@*/