summaryrefslogtreecommitdiff
path: root/rpmdb
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-06-15 19:43:41 +0000
committerjbj <devnull@localhost>2002-06-15 19:43:41 +0000
commit20901c1a62c2ec5bdff92bf2881ec51cb5ce7656 (patch)
tree30764e090f4af19bdbf6fb136badf0307a7c44ab /rpmdb
parent8336b090a9996532e63e32cd8c483a9128be2dc9 (diff)
downloadlibrpm-tizen-20901c1a62c2ec5bdff92bf2881ec51cb5ce7656.tar.gz
librpm-tizen-20901c1a62c2ec5bdff92bf2881ec51cb5ce7656.tar.bz2
librpm-tizen-20901c1a62c2ec5bdff92bf2881ec51cb5ce7656.zip
- beecrypt: merge changes from beecrypt-2.3.0.
- beecrypt: merge doxygen markup with rpmapi doco. - beecrypt: revert cpu/arch compile option mixup (#66752). CVS patchset: 5495 CVS date: 2002/06/15 19:43:41
Diffstat (limited to 'rpmdb')
-rw-r--r--rpmdb/.lclintrc58
-rw-r--r--rpmdb/rpmdb.c4
2 files changed, 29 insertions, 33 deletions
diff --git a/rpmdb/.lclintrc b/rpmdb/.lclintrc
index a161a849c..b2b983ead 100644
--- a/rpmdb/.lclintrc
+++ b/rpmdb/.lclintrc
@@ -11,7 +11,6 @@
-unrecogcomments # XXX ignore doxygen markings
+strict # lclint level
-#-includenest 16 # getting deep, sigh
# --- +partial artifacts
-declundef
@@ -24,43 +23,36 @@
-varuse
# --- not-yet at strict level
--bitwisesigned # pita
--elseifcomplete # 95 occurences
--exportconst # 839 occurences
--exportfcn
--exporttype
--exportvar
--fielduse # 1 occurence <bits/sigset.h>
+-bitwisesigned # 160
+-elseifcomplete # 9
+-exportconst # 687
+-exportfcn # 464
+-exporttype # 196
+-exportvar # 55
+-fielduse # 225 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
+-incondefs # 93 <bits/{ipc,pthreadtypes}.h> heartburn
+-namechecks # 1679
+-ptrarith # 201
--compdestroy
--mustdefine
--shiftimplementation
-#-shiftnegative
+-compdestroy # 125
+-mustdefine # 76
+-shiftimplementation # 296
--strictops
--strictusereleased
--stringliterallen 4096 # redhat*PubKey's are big
--whileblock # tedious
+-strictops # 54
+-strictusereleased # 3
+-whileblock # 20
# --- not-yet at checks level
--ansi-reserved
-+enumint
--mustfree
--predboolptr
--usedef
++enumint # 211
+-mustfree # 219
+-predboolptr # 107
+-usedef # 42
# --- not-yet at standard level
--boolops
--predboolint
-+boolint
-+charint
-+ignorequals
-+matchanyintegral
+-boolops # 81
++boolint # 18
++charint # 74
++ignorequals # 104
++matchanyintegral # 90
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 5aa5dd5ce..9d902f4ff 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -210,8 +210,10 @@ dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, /*@unused@*/ unsigned int flags)
return NULL;
/* Is this index already open ? */
+/*@-compdef@*/ /* FIX: db->_dbi may be NULL */
if ((dbi = db->_dbi[dbix]) != NULL)
return dbi;
+/*@=compdef@*/
/*@-globs -mods @*/ /* FIX: rpmGlobalMacroContext not in <rpmlib.h> */
_dbapi_rebuild = rpmExpandNumeric("%{_dbapi_rebuild}");
@@ -291,7 +293,9 @@ exit:
else
dbi = db3Free(dbi);
+/*@-compdef -nullstate@*/ /* FIX: db->_dbi may be NULL */
return dbi;
+/*@=compdef =nullstate@*/
}
/**