diff options
| author | jbj <devnull@localhost> | 2001-09-21 15:07:11 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-09-21 15:07:11 +0000 |
| commit | 1eef0782f60f9d8d80be273ace982ad4c2a56d98 (patch) | |
| tree | ca6f47772d1cfa3b9900cf93ae515f1c5a31a4cd /rpmdb | |
| parent | 59a045374df64f3bc62eb200f7d11338ea2787a8 (diff) | |
| download | librpm-tizen-1eef0782f60f9d8d80be273ace982ad4c2a56d98.tar.gz librpm-tizen-1eef0782f60f9d8d80be273ace982ad4c2a56d98.tar.bz2 librpm-tizen-1eef0782f60f9d8d80be273ace982ad4c2a56d98.zip | |
- lclint-3.0.0.15 fiddles.
CVS patchset: 5067
CVS date: 2001/09/21 15:07:11
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/dbconfig.c | 5 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index 491421431..d23aeb2e1 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -399,7 +399,6 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) /* Save value in template as appropriate. */ switch (argInfo & POPT_ARG_MASK) { - long aLong; case POPT_ARG_NONE: (void) dbSaveInt(opt, argInfo, 1L); @@ -417,7 +416,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) case POPT_ARG_INT: case POPT_ARG_LONG: - aLong = strtol(p, &pe, 0); + { long aLong = strtol(p, &pe, 0); if (pe) { if (!xstrncasecmp(pe, "Mb", 2)) aLong *= 1024 * 1024; @@ -449,7 +448,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag) } (void) dbSaveInt(opt, argInfo, aLong); } - break; + } break; default: break; } diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index a38c58de2..a819e8131 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -630,7 +630,7 @@ static INLINE int dbiAppendSet(dbiIndexSet set, const void * recs, size_t rlen = (recsize < sizeof(*(set->recs))) ? recsize : sizeof(*(set->recs)); - if (set == NULL || recs == NULL || nrecs <= 0 || recsize <= 0) + if (set == NULL || recs == NULL || nrecs <= 0 || recsize == 0) return 1; if (set->count == 0) @@ -1485,7 +1485,9 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) mire->pattern = _free(mire->pattern); if (mire->preg != NULL) { regfree(mire->preg); + /*@+voidabstract@*/ mire->preg = _free(mire->preg); + /*@=voidabstract@*/ } } mi->mi_re = _free(mi->mi_re); @@ -1726,7 +1728,9 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag, allpat = _free(allpat); if (preg) { regfree(preg); + /*@+voidabstract@*/ preg = _free(preg); + /*@=voidabstract@*/ } /*@=kepttrans@*/ return rc; |