Annotate incondefs in source code.

CVS patchset: 5509
CVS date: 2002/06/19 18:52:46

6 files changed, 19 insertions, 8 deletions

diff --git a/rpmio/.lclintrc b/rpmio/.lclintrc
index 944f7d435..29a159cee 100644
--- a/rpmio/.lclintrc
+++ b/rpmio/.lclintrc
@@ -12,6 +12,10 @@
 
 +strict			# lclint level
 
+# --- in progress
+#+bounds		# 334
+#+boundswrite		# 152
+
 # --- +partial artifacts
 -declundef
 -exportheadervar
@@ -32,13 +36,12 @@
 -fielduse		# 72
 -forblock		# tedious
 -ifblock		# tedious
--incondefs		# 96 <bits/{ipc,pthreadtypes}.h> heartburn
--namechecks		# 1454 tedious ANSI compliance checks
+-namechecks		# 929 tedious ANSI compliance checks
 -ptrarith		# 104
 
 -compdestroy		# 21
 -mustdefine		# 34
--shiftimplementation	# ctype.h pain
+-sys-dir-errors
 
 -strictops		# 51
 -whileblock		# tedious
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index a2008adcd..70eef4238 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -357,11 +357,13 @@ int Unlink(const char * path)
 /**
  * readlink(2) clone.
  */
+/*@-incondefs@*/
 int Readlink(const char * path, /*@out@*/ char * buf, size_t bufsiz)
 	/*@globals errno, fileSystem @*/
 	/*@modifies *buf, errno, fileSystem @*/
 	/*@requires maxSet(buf) >= (bufsiz - 1) @*/
 	/*@ensures result <= bufsiz @*/;
+/*@=incondefs@*/
 
 /**
  * stat(2) clone.
@@ -469,12 +471,14 @@ off_t	fdSize(FD_t fd)
 
 /**
  */
+/*@-incondefs@*/
 ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count)
 	/*@globals errno, fileSystem @*/
 	/*@modifies *cookie, *buf, errno, fileSystem @*/
 	/*@requires maxSet(buf) >= (count - 1) @*/
 	/*@ensures maxRead(buf) >= count @*/ ;
 #define	fdRead(_fd, _buf, _count)	fdio->read((_fd), (_buf), (_count))
+/*@=incondefs@*/
 
 /**
  */
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 832215114..dbd34be17 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -151,6 +151,7 @@ extern int _rpmio_debug;
 /*@=redecl@*/
 
 /*@-redecl@*/
+/*@unchecked@*/
 extern int _ftp_debug;
 /*@=redecl@*/
 
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 208505a90..bd710398d 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -776,9 +776,9 @@ static const byte * pgpPrtSeckeyParams(/*@unused@*/ byte pubkey_algo,
 	    /*@innerbreak@*/ break;
 	case 0x03:
 	    pgpPrtVal(" iterated/salted ", pgpHashTbl, p[2]);
-	    /*@-shiftnegative@*/ /* FIX: unsigned cast */
+	    /*@-shiftnegative -shiftimplementation @*/ /* FIX: unsigned cast */
 	    i = (16 + (p[11] & 0xf)) << ((p[11] >> 4) + 6);
-	    /*@=shiftnegative@*/
+	    /*@=shiftnegative =shiftimplementation @*/
 	    pgpPrtHex("", p+3, 8);
 	    pgpPrtInt(" iter", i);
 	    p += 11;
@@ -1005,7 +1005,6 @@ struct pgpDig_s * pgpNewDig(void)
 }
 
 void pgpCleanDig(struct pgpDig_s * dig)
-	/*@modifies dig @*/
 {
     if (dig != NULL) {
 	int i;
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 7e9d02b5f..ec4004ae6 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -938,7 +938,7 @@ typedef enum pgpArmorKey_e {
     PGPARMORKEY_COMMENT		= 2, /*!< Comment: */
     PGPARMORKEY_MESSAGEID	= 3, /*!< MessageID: */
     PGPARMORKEY_HASH		= 4, /*!< Hash: */
-    PGPARMORKEY_CHARSET		= 5 /*!< Charset: */
+    PGPARMORKEY_CHARSET		= 5  /*!< Charset: */
 } pgpArmorKey;
 /*@=typeuse@*/
 
@@ -1201,7 +1201,7 @@ struct pgpDig_s * pgpNewDig(void)
 /**
  */
 void pgpCleanDig(/*@null@*/ struct pgpDig_s * dig)
-	/*@modifies *dig @*/;
+	/*@modifies dig @*/;
 
 /**
  */
diff --git a/rpmio/url.c b/rpmio/url.c
index bc89ec732..dddeb93da 100644
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -39,14 +39,18 @@ int _url_debug = 0;
 
 /**
  */
+/*@-incondefs@*/
 /*@unchecked@*/
 /*@only@*/ /*@null@*/
 urlinfo *_url_cache = NULL;
+/*@=incondefs@*/
 
 /**
  */
+/*@-incondefs@*/
 /*@unchecked@*/
 int _url_count = 0;
+/*@=incondefs@*/
 
 /**
  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.