Annotate incondefs in source code.

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

diff --git a/build/.lclintrc b/build/.lclintrc
index 1aae11d9a263d90d3c32771a1b7c153a8fdb8081..024e1a3558262527eccfc3271637bf0865df9dd7 100644 (file)
--- a/build/.lclintrc
+++ b/build/.lclintrc
@@ -11,7 +11,10 @@
 -unrecogcomments       # XXX ignore doxygen markings
 
 +strict                        # lclint level
--includenest 16                # getting deep, sigh
+
+# --- in progress
+#+bounds               # 281
+#+boundswrite          # 132
 
 # --- +partial artifacts
 -declundef
@@ -33,25 +36,17 @@
 -fielduse              # 1 occurence <bits/sigset.h>
 -forblock              # tedious
 -ifblock               # tedious
--incondefs             # <bits/{ipc,pthreadtypes}.h> heartburn
--matchfields           # <bits/ipc.h> heartburn
 -namechecks            # tedious ANSI compliance checks
--numenummembers 1024   # RPMTAG has 138 members
--numstructfields 256   # Java jni.h has 229 fields
 -ptrarith              # tedious
 
 -compdestroy
 -mustdefine
--shiftimplementation
-#-shiftnegative
+-sys-dir-errors
 
 -strictops
--strictusereleased
--stringliterallen 4096 # redhat*PubKey's are big
 -whileblock            # tedious
 
 # --- not-yet at checks level
--ansi-reserved
 +enumint
 -mustfree
 -predboolptr
@@ -59,7 +54,6 @@
 
 # --- not-yet at standard level
 -boolops
--predboolint
 +boolint
 +charint
 +ignorequals

diff --git a/build/myftw.c b/build/myftw.c
index 7bb6f35a6ff2c5e1d09875e826a8fac77b9d7856..ce04f85764509338225ab01db665d2dae3dcd52c 100644 (file)
--- a/build/myftw.c
+++ b/build/myftw.c
@@ -176,6 +176,7 @@ myftw_dir (DIR **dirs, int level, int descriptors,
 
 /* Call a function on every element in a directory tree.  */
 
+/*@-bounds@*/
 int myftw (const char *dir,
           int descriptors,
           myftwFunc func,
@@ -247,3 +248,4 @@ int myftw (const char *dir,
 
   return retval;
 }
+/*@=bounds@*/

diff --git a/lib/.lclintrc b/lib/.lclintrc
index 236200c6e7ad1c587817e3c3a736cb3224d7e404..e2e19e31f2ec40bd1dbda6dfb55e08fd6f468881 100644 (file)
--- a/lib/.lclintrc
+++ b/lib/.lclintrc
@@ -13,8 +13,8 @@
 +strict                        # lclint level
 
 # --- in progress
-#+bounds
-#+boundswrite
+#+bounds               # 629
+#+boundswrite          # 317
 -redecl
 
 # --- +partial artifacts
@@ -28,7 +28,7 @@
 -varuse
 
 # --- not-yet at strict level
--bitwisesigned         # pita
+-bitwisesigned         # 255
 -elseifcomplete                # 95 occurences
 -exportconst           # 839 occurences
 -exportfcn
@@ -37,13 +37,12 @@
 -fielduse              # 1 occurence <bits/sigset.h>
 -forblock              # tedious
 -ifblock               # tedious
--incondefs             # <bits/{ipc,pthreadtypes}.h> heartburn
--namechecks            # tedious ANSI compliance checks
+-namechecks            # 1843 tedious ANSI compliance checks
 -ptrarith              # 164
 
 -compdestroy           # 66
 -mustdefine            # 66
--shiftimplementation   # 696
+-sys-dir-errors
 
 -strictops             # 46
 -whileblock            # 54

diff --git a/lib/misc.c b/lib/misc.c
index b674d279114339a1049141aefee318285a793ff0..b539726316adc3dd4c1f1cf8f997dccce9e7014e 100644 (file)
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -21,6 +21,7 @@ const char * RPMVERSION = VERSION;
 /*@access Header@*/            /* XXX compared with NULL */
 /*@access FD_t@*/              /* XXX compared with NULL */
 
+/*@-bounds@*/
 char ** splitString(const char * str, int length, char sep)
 {
     const char * source;
@@ -56,6 +57,7 @@ char ** splitString(const char * str, int length, char sep)
 
     return list;
 }
+/*@=bounds@*/
 
 void freeSplitString(char ** list)
 {

diff --git a/lib/poptI.c b/lib/poptI.c
index f035050bf764974b3d0e745f2c25cb36fe573c03..69a1c8e94f2e981afe0e735e530e61b363934381 100644 (file)
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -31,6 +31,7 @@ struct rpmInstallArguments_s rpmIArgs;
 
 /**
  */
+/*@-bounds@*/
 static void installArgCallback( /*@unused@*/ poptContext con,
                /*@unused@*/ enum poptCallbackReason reason,
                const struct poptOption * opt, const char * arg,
@@ -90,6 +91,7 @@ static void installArgCallback( /*@unused@*/ poptContext con,
     }
     /*@=branchstate@*/
 }
+/*@=bounds@*/
 
 /**
  */

diff --git a/lib/psm.c b/lib/psm.c
index 5d86e24badfee855b8ecdc9db42685cfbceee361..4a07d5ee547e1edbc5e58a9da8c4cc243e431881 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -348,6 +348,7 @@ static int mergeFiles(rpmfi fi, Header h, Header newH)
  * @param psm          package state machine data
  * @return             0 always
  */
+/*@-bounds@*/
 static int markReplacedFiles(const PSM_t psm)
        /*@globals fileSystem@*/
        /*@modifies psm, fileSystem @*/
@@ -421,6 +422,7 @@ static int markReplacedFiles(const PSM_t psm)
 
     return 0;
 }
+/*@=bounds@*/
 
 /**
  * Create directory if it does not exist, make sure path is writable.

diff --git a/lib/rpmal.c b/lib/rpmal.c
index 2f301d5e00e06e8b71faee56be0bc97050d10bd6..09a9977ebab826e5681119c2def26ec61eb961cc 100644 (file)
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -370,6 +370,7 @@ fprintf(stderr, "*** del %p[%d]\n", al->list, pkgNum);
     return;
 }
 
+/*@-bounds@*/
 alKey rpmalAdd(rpmal * alistp, alKey pkgKey, fnpyKey key,
                rpmds provides, rpmfi fi)
 {
@@ -507,6 +508,7 @@ fprintf(stderr, "+++ die[%3d] %p [%d] %s\n", al->numDirs, die, die->dirNameLen,
 assert(((alNum)(alp - al->list)) == pkgNum);
     return ((alKey)(alp - al->list));
 }
+/*@=bounds@*/
 
 /**
  * Compare two available index entries by name (qsort/bsearch).

diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 3e16f611bf47c75695b8adab79c53d4b95cbbe4f..73a20c5d6c731639cb09f32fef2060b4a23c7a89 100644 (file)
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -12,9 +12,8 @@
 /** \ingroup rpmcli
  * Should version 3 packages be produced?
  */
-/*@-redecl@*/
+/*@unchecked@*/
 extern int _noDirTokens;
-/*@=redecl@*/
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/rpmds.c b/lib/rpmds.c
index a8e420677391bca1586930453720f88c030c6bbf..479e95b961769242b7e1c4b4921714bb5abaf63c 100644 (file)
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -453,7 +453,7 @@ fprintf(stderr, "*** ds %p\t%s[%d]: %s\n", ds, (ds->Type ? ds->Type : "?Type?"),
     return i;
 }
 
-rpmds rpmdsInit(/*@returned@*/ /*@null@*/ rpmds ds)
+rpmds rpmdsInit(/*@null@*/ rpmds ds)
        /*@modifies ds @*/
 {
     if (ds != NULL)

diff --git a/lib/rpmds.h b/lib/rpmds.h
index 6319e93d65c132e1205e0f7ae0a87978b673ba2b..ab5573f8530bd48d8824def3978dd28a672b5028 100644 (file)
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -37,7 +37,8 @@ struct rpmds_s {
     int_32 * Flags;            /*!< Flags identifying context/comparison. */
     rpmTagType Nt, EVRt, Ft;   /*!< Tag data types. */
     int_32 Count;              /*!< No. of elements */
-/*@refs@*/ int nrefs;          /*!< Reference count. */
+/*@refs@*/
+    int nrefs;                 /*!< Reference count. */
 };
 #endif /* _RPMDS_INTERNAL */
 
@@ -71,11 +72,12 @@ rpmds XrpmdsUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmds ds,
  * @param msg
  * @return             new dependency set reference
  */
-/*@unused@*/
+/*@unused@*/ /*@newref@*/
 rpmds rpmdsLink (/*@null@*/ rpmds ds, /*@null@*/ const char * msg)
        /*@modifies ds @*/;
 
 /** @todo Remove debugging entry from the ABI. */
+/*@newref@*/
 rpmds XrpmdsLink (/*@null@*/ rpmds ds, /*@null@*/ const char * msg,
                const char * fn, unsigned ln)
         /*@modifies ds @*/;

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 9c542133c4cee881c81d2549cb63cf8fd07b0834..7118696e54f7b028ecb6fae9a7028b575065ba79 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -380,6 +380,7 @@ fileTypes whatis(uint_16 mode)
  * @param actions      file dispositions
  * @return             header with relocated files
  */
+/*@-bounds@*/
 static
 Header relocateFileList(const rpmts ts, rpmfi fi,
                Header origH, fileAction * actions)
@@ -805,6 +806,7 @@ Header relocateFileList(const rpmts ts, rpmfi fi,
 
     return h;
 }
+/*@=bounds@*/
 
 rpmfi rpmfiFree(rpmfi fi, int freefimem)
 {

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 5db9fdfe77a5bce80a0cbd35d3b0d9ef16951353..d136da50058fcd5d3f142f5a056320925f7d3a7b 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -216,6 +216,7 @@ struct rpmEIU {
 };
 
 /** @todo Generalize --freshen policies. */
+/*@-bounds@*/
 int rpmInstall(rpmts ts,
                struct rpmInstallArguments_s * ia,
                const char ** fileArgv)
@@ -630,6 +631,7 @@ exit:
 
     return eiu->numFailed;
 }
+/*@=bounds@*/
 
 int rpmErase(rpmts ts,
                const struct rpmInstallArguments_s * ia,

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index e5020de3f673d58f1da704cf6b367e57b64ddd7b..5b1346809cf0cd2209b33b3d57b1a958e810ed80 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -29,16 +29,16 @@ extern struct MacroContext_s * rpmGlobalMacroContext;
 /*@checked@*/
 extern struct MacroContext_s * rpmCLIMacroContext;
 
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern const char * RPMVERSION;
 
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern const char * rpmNAME;
 
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern const char * rpmEVR;
 
-/*@checked@*/
+/*@unchecked@*/
 extern int rpmFLAGS;
 /*@=redecl@*/
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 89877f494b279a104e1af730d0a0af447a713002..c7a9b1d9a800c2dacd3fcd6500841a4d8ebaf9a2 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -781,6 +781,7 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 
 /**
  */
+/*@-bounds@*/
 static int rpmPlatform(const char * platform)
        /*@globals nplatpat, platpat,
                rpmGlobalMacroContext, fileSystem, internalState @*/
@@ -882,6 +883,7 @@ exit:
 /*@=modobserver@*/
     return rc;
 }
+/*@=bounds@*/
 
 
 #      if defined(__linux__) && defined(__i386__)

diff --git a/lib/rpmte.c b/lib/rpmte.c
index fee9b899ddb3c35f6da938b0bdadfe74d60414da..9c872d034f815563a86970f80dc6a6c35f3f0218 100644 (file)
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -75,6 +75,7 @@ static void delTE(rpmte p)
 
 /**
  */
+/*@-bounds@*/
 static void addTE(rpmts ts, rpmte p, Header h,
                /*@dependent@*/ /*@null@*/ fnpyKey key,
                /*@null@*/ rpmRelocation * relocs)
@@ -141,6 +142,7 @@ static void addTE(rpmts ts, rpmte p, Header h,
        p->relocs = NULL;
     }
 }
+/*@=bounds@*/
 
 rpmte rpmteFree(rpmte te)
 {

diff --git a/lib/rpmts.c b/lib/rpmts.c
index a4a01bbf87fcd30a193dce1b6abbc31ba649a247..14308929b8574cae87aa53711db3379740a5427c 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -192,6 +192,7 @@ static int sugcmp(const void * a, const void * b)       /*@*/
     return strcmp(astr, bstr);
 }
 
+/*@-bounds@*/
 int rpmtsSolve(rpmts ts, rpmds ds)
 {
     const char * errstr;
@@ -287,6 +288,7 @@ exit:
     return rc;
 /*@=nullstate@*/
 }
+/*@=bounds@*/
 
 int rpmtsAvailable(rpmts ts, const rpmds ds)
 {

diff --git a/lib/rpmts.h b/lib/rpmts.h
index 9a9eaa62934192ae0cc2321cf8b18e5d69b54bb9..ac7fa7e55e81d4a703ff867a1a9b73af075a90fa 100644 (file)
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -525,7 +525,7 @@ int rpmtsSetNotifyCallback(rpmts ts,
  * Create an empty transaction set.
  * @return             new transaction set
  */
-/*@only@*/
+/*@newref@*/
 rpmts rpmtsCreate(void)
        /*@*/;
 

diff --git a/lib/transaction.c b/lib/transaction.c
index 439867137fb231b9b745b78540da690c8ff35885..906f847056a9b4490edd89f8e171258b981d1c0c 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -712,6 +712,7 @@ static int ensureOlder(rpmts ts,
 /**
  */
 /*@-mustmod@*/ /* FIX: fi->actions is modified. */
+/*@-bounds@*/
 static void skipFiles(const rpmts ts, rpmfi fi)
        /*@globals rpmGlobalMacroContext @*/
        /*@modifies fi, rpmGlobalMacroContext @*/
@@ -903,6 +904,7 @@ static void skipFiles(const rpmts ts, rpmfi fi)
 #endif
     if (languages) freeSplitString((char **)languages);
 }
+/*@=bounds@*/
 /*@=mustmod@*/
 
 /**

diff --git a/popt/.lclintrc b/popt/.lclintrc
index 488dbf55e92170b6213dd237bab8b407e1e5f34b..6a70b04cad24e17ee1fb257184f25cb0218561a7 100644 (file)
--- a/popt/.lclintrc
+++ b/popt/.lclintrc
@@ -26,12 +26,12 @@
 -exportfcn             # 25
 -globs                 # 12 <ctype.h>
 -ifblock               # 202
--incondefs             # 37 <bits/{ipc,pthreadtypes}.h> heartburn
 -namechecks            # 206
 -ptrarith              # 43
 
 -mustdefine            # 10
 -shiftimplementation   # 120
+-sys-dir-errors
 
 -strictops             # 16
 -whileblock            # 10

diff --git a/popt/popt.h b/popt/popt.h
index 60d27e6879449664b9f6b4e6dfae79cc20278b2b..c756061dce0fdfd0c5ab22727d5304382a2b0b05 100644 (file)
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -151,7 +151,7 @@ typedef struct poptItem_s {
  * Empty table marker to enable displaying popt alias/exec options.
  */
 /*@-exportvar@*/
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptAliasOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
@@ -161,7 +161,7 @@ extern struct poptOption poptAliasOptions[];
  * Auto help table options.
  */
 /*@-exportvar@*/
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptHelpOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \

diff --git a/rpmdb/.lclintrc b/rpmdb/.lclintrc
index b2b983eadb70103d6dc52303008bb3d7196e36c1..cd925dd3522a56f918f00b441249a5e6a8576965 100644 (file)
--- a/rpmdb/.lclintrc
+++ b/rpmdb/.lclintrc
@@ -32,13 +32,12 @@
 -fielduse              # 225 occurence <bits/sigset.h>
 -forblock              # tedious
 -ifblock               # tedious
--incondefs             # 93 <bits/{ipc,pthreadtypes}.h> heartburn
 -namechecks            # 1679
 -ptrarith              # 201
 
 -compdestroy           # 125
 -mustdefine            # 76
--shiftimplementation   # 296
+-sys-dir-errors
 
 -strictops             # 54
 -strictusereleased     # 3

diff --git a/rpmdb/header.c b/rpmdb/header.c
index e73ff12fa2a70cbbba64081a4038ae5993d65159..83008ce7cbe4395e5beb2160955bc86d63adcb43 100644 (file)
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -2721,7 +2721,9 @@ static char * formatValue(sprintfTag tag, Header h,
        if (((*vallenp) + need) >= (*allocedp)) {
            if ((*allocedp) <= need)
                (*allocedp) += need;
+/*@-shiftimplementation@*/
            (*allocedp) <<= 1;
+/*@=shiftimplementation@*/
 /*@-unqualifiedtrans@*/ /* FIX: double indirection */
            (*valp) = xrealloc((*valp), (*allocedp)+1); 
 /*@=unqualifiedtrans@*/
@@ -2765,7 +2767,9 @@ static char * singleSprintf(Header h, sprintfToken token,
        if (((*vallenp) + need) >= (*allocedp)) {
            if ((*allocedp) <= need)
                (*allocedp) += need;
+/*@-shiftimplementation@*/
            (*allocedp) <<= 1;
+/*@=shiftimplementation@*/
 /*@-unqualifiedtrans@*/ /* FIX: double indirection */
            (*valp) = xrealloc((*valp), (*allocedp)+1); 
 /*@=unqualifiedtrans@*/
@@ -2797,7 +2801,9 @@ static char * singleSprintf(Header h, sprintfToken token,
        if (((*vallenp) + need) >= (*allocedp)) {
            if ((*allocedp) <= need)
                (*allocedp) += need;
+/*@-shiftimplementation@*/
            (*allocedp) <<= 1;
+/*@=shiftimplementation@*/
 /*@-unqualifiedtrans@*/ /* FIX: double indirection */
            (*valp) = xrealloc((*valp), (*allocedp)+1); 
 /*@=unqualifiedtrans@*/
@@ -2836,7 +2842,9 @@ static char * singleSprintf(Header h, sprintfToken token,
            if (((*vallenp) + need) >= (*allocedp)) {
                if ((*allocedp) <= need)
                    (*allocedp) += need;
+/*@-shiftimplementation@*/
                (*allocedp) <<= 1;
+/*@=shiftimplementation@*/
 /*@-unqualifiedtrans@*/ /* FIX: double indirection */
                (*valp) = xrealloc((*valp), (*allocedp)+1);     
 /*@=unqualifiedtrans@*/
@@ -2850,7 +2858,9 @@ static char * singleSprintf(Header h, sprintfToken token,
            if (((*vallenp) + need) >= (*allocedp)) {
                if ((*allocedp) <= need)
                    (*allocedp) += need;
+/*@-shiftimplementation@*/
                (*allocedp) <<= 1;
+/*@=shiftimplementation@*/
 /*@-unqualifiedtrans@*/ /* FIX: double indirection */
                (*valp) = xrealloc((*valp), (*allocedp)+1);     
 /*@=unqualifiedtrans@*/

diff --git a/rpmdb/merge.c b/rpmdb/merge.c
index 7e244407fb20ca0afc4b9ec128e84b5038594ed3..e3fbd0d8f19da71f63c727037231651c44d48b7d 100644 (file)
--- a/rpmdb/merge.c
+++ b/rpmdb/merge.c
@@ -269,6 +269,7 @@ mergesort(void *base, size_t nmemb, size_t size,
                                                goto EXPONENTIAL;
                                        }
                        } else {
+/*@-shiftimplementation@*/
 EXPONENTIAL:                   for (i = size; ; i <<= 1)
                                        if ((p = (b + i)) >= t) {
                                                if ((p = t - size) > b &&
@@ -300,6 +301,7 @@ FASTCASE:                   while (i > size)
                                        else
                                                b = p;
                                /*@=infloopsuncon@*/
+/*@=shiftimplementation@*/
 COPY:                          b = t;
                        }
                        i = size;

diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index d91b3668f801684a29f6a962a8ba81253f09dd86..d97d2a20871977aa84ae48b40e7ed28ca3e69671 100644 (file)
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -1007,8 +1007,8 @@ int rpmdbRemove(/*@null@*/ rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
  * @return             0 on success
  */
 int rpmdbRebuild(/*@null@*/ const char * prefix)
-       /*@globals rpmGlobalMacroContext, fileSystem @*/
-       /*@modifies rpmGlobalMacroContext, fileSystem @*/;
+       /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+       /*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /**
  * Mergesort, same arguments as qsort(2).

diff --git a/rpmio/.lclintrc b/rpmio/.lclintrc
index 944f7d435c11a56f65cc1e2b3e20b251b62aad20..29a159ceef121c0c91e877083568529b4080d9ee 100644 (file)
--- 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 a2008adcd5c10fc424014f9ab1f532d04fbb8c02..70eef4238b03943679841d0f34ac1dd7411d84dd 100644 (file)
--- 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 8322151144b5b573518e86d00b135d4dc370122d..dbd34be17198aa3ec00b238603f5243fd1f7a96a 100644 (file)
--- 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 208505a90fd971280bb239708112bc6eaa175527..bd710398dd4c7b2030a31725d243e273b4297f74 100644 (file)
--- 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 7e9d02b5fc3b997fd4537ad511e20a9221ba573f..ec4004ae66c8a813991fa4161156de8dd13a6440 100644 (file)
--- 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 bc89ec732c3ff220c1af97c28212c5fa04522501..dddeb93dac19f3878aae7eeccbe6ba64293ea523 100644 (file)
--- 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.