summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/.lclintrc16
-rw-r--r--build/myftw.c2
-rw-r--r--lib/.lclintrc11
-rw-r--r--lib/misc.c2
-rw-r--r--lib/poptI.c2
-rw-r--r--lib/psm.c2
-rw-r--r--lib/rpmal.c2
-rw-r--r--lib/rpmcli.h3
-rw-r--r--lib/rpmds.c2
-rw-r--r--lib/rpmds.h6
-rw-r--r--lib/rpmfi.c2
-rw-r--r--lib/rpminstall.c2
-rw-r--r--lib/rpmlib.h8
-rw-r--r--lib/rpmrc.c2
-rw-r--r--lib/rpmte.c2
-rw-r--r--lib/rpmts.c2
-rw-r--r--lib/rpmts.h2
-rw-r--r--lib/transaction.c2
-rw-r--r--popt/.lclintrc2
-rw-r--r--popt/popt.h4
-rw-r--r--rpmdb/.lclintrc3
-rw-r--r--rpmdb/header.c10
-rw-r--r--rpmdb/merge.c2
-rw-r--r--rpmdb/rpmdb.h4
-rw-r--r--rpmio/.lclintrc9
-rw-r--r--rpmio/rpmio.h4
-rw-r--r--rpmio/rpmio_internal.h1
-rw-r--r--rpmio/rpmpgp.c5
-rw-r--r--rpmio/rpmpgp.h4
-rw-r--r--rpmio/url.c4
30 files changed, 80 insertions, 42 deletions
diff --git a/build/.lclintrc b/build/.lclintrc
index 1aae11d9a..024e1a355 100644
--- 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 7bb6f35a6..ce04f8576 100644
--- 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 236200c6e..e2e19e31f 100644
--- 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 b674d2791..b53972631 100644
--- 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 f035050bf..69a1c8e94 100644
--- 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 5d86e24ba..4a07d5ee5 100644
--- 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 2f301d5e0..09a9977eb 100644
--- 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 3e16f611b..73a20c5d6 100644
--- 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 a8e420677..479e95b96 100644
--- 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 6319e93d6..ab5573f85 100644
--- 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 9c542133c..7118696e5 100644
--- 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 5db9fdfe7..d136da500 100644
--- 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 e5020de3f..5b1346809 100644
--- 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 89877f494..c7a9b1d9a 100644
--- 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 fee9b899d..9c872d034 100644
--- 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 a4a01bbf8..14308929b 100644
--- 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 9a9eaa629..ac7fa7e55 100644
--- 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 439867137..906f84705 100644
--- 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 488dbf55e..6a70b04ca 100644
--- 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 60d27e687..c756061dc 100644
--- 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 b2b983ead..cd925dd35 100644
--- 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 e73ff12fa..83008ce7c 100644
--- 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 7e244407f..e3fbd0d8f 100644
--- 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 d91b3668f..d97d2a208 100644
--- 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 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 03:55:07 +0000