Splint fiddles from rpmdav.c take 0.

CVS patchset: 7539
CVS date: 2004/11/04 19:27:48

4 files changed, 15 insertions, 7 deletions

diff --git a/neon/src/ne_props.c b/neon/src/ne_props.c
index 88dc20c5c..8f7caaa97 100644
--- a/neon/src/ne_props.c
+++ b/neon/src/ne_props.c
@@ -51,6 +51,7 @@ struct ne_propfind_handler_s {
 
     /* Callback to create the private structure. */
     ne_props_create_complex private_creator;
+/*@null@*/
     void *private_userdata;
     
     /* Current propset, or NULL if none being processed. */
diff --git a/neon/src/ne_props.h b/neon/src/ne_props.h
index 1d3b6c53d..3e6808248 100644
--- a/neon/src/ne_props.h
+++ b/neon/src/ne_props.h
@@ -54,7 +54,7 @@ BEGIN_NEON_DECLS
 
 /* The name of a WebDAV property. 'nspace' may be NULL. */
 typedef struct {
-/*@observer@*/
+/*@observer@*/ /*@null@*/
     const char *nspace;
 /*@observer@*/
     const char *name;
@@ -242,7 +242,7 @@ typedef void *(*ne_props_create_complex)(void *userdata,
 
 void ne_propfind_set_private(ne_propfind_handler *handler,
 			     ne_props_create_complex creator,
-			     void *userdata)
+			     /*@null@*/ void *userdata)
 	/*@modifies handler @*/;
 
 /* Fetch all properties.
diff --git a/neon/src/ne_xml.c b/neon/src/ne_xml.c
index 8081bc349..2263c8060 100644
--- a/neon/src/ne_xml.c
+++ b/neon/src/ne_xml.c
@@ -60,9 +60,13 @@ typedef xmlChar ne_xml_char;
 #define ERR_SIZE (2048)
 
 struct handler {
+/*@null@*/
     ne_xml_startelm_cb *startelm_cb; /* start-element callback */
+/*@null@*/
     ne_xml_endelm_cb *endelm_cb; /* end-element callback */
+/*@null@*/
     ne_xml_cdata_cb *cdata_cb; /* character-data callback. */
+/*@null@*/
     void *userdata; /* userdata for the above. */
     struct handler *next; /* next handler in stack. */
 };
diff --git a/neon/src/ne_xml.h b/neon/src/ne_xml.h
index 59136f797..2a87d7d1c 100644
--- a/neon/src/ne_xml.h
+++ b/neon/src/ne_xml.h
@@ -85,10 +85,10 @@ ne_xml_parser *ne_xml_create(void)
 /* Push a new handler on the stack of parser 'p'. 'cdata' and/or
  * 'endelm' may be NULL; startelm must be non-NULL. */
 void ne_xml_push_handler(ne_xml_parser *p,
-                         ne_xml_startelm_cb *startelm, 
-                         ne_xml_cdata_cb *cdata,
-                         ne_xml_endelm_cb *endelm,
-                         void *userdata)
+                         /*@null@*/ ne_xml_startelm_cb *startelm, 
+                         /*@null@*/ ne_xml_cdata_cb *cdata,
+                         /*@null@*/ ne_xml_endelm_cb *endelm,
+                         /*@null@*/ void *userdata)
 	/*@modifies p @*/;
 
 /* ne_xml_failed returns non-zero if there was an error during
@@ -154,7 +154,10 @@ struct ne_xml_idmap {
 };
 
 /* Return the size of an idmap array */
-#define NE_XML_MAPLEN(map) (sizeof(map) / sizeof(struct ne_xml_idmap))
+#define NE_XML_MAPLEN(map) \
+    /*@-sizeoftype@*/ \
+    (sizeof(map) / sizeof(struct ne_xml_idmap)) \
+    /*@=sizeoftype@*/
 
 /* Return the 'id' corresponding to {nspace, name}, or zero. */
 int ne_xml_mapid(const struct ne_xml_idmap map[], size_t maplen,