diff options
| author | jbj <devnull@localhost> | 2002-01-23 00:58:47 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-01-23 00:58:47 +0000 |
| commit | 0bbb7bb94e340b22f584c9ebd8a1f667d68217bd (patch) | |
| tree | 816aac2f8f6e756054bc5e75c3cf9d231f47187e /rpmdb | |
| parent | c74fa2496545a34868e93ab830b304033781cde3 (diff) | |
| download | librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.tar.gz librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.tar.bz2 librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.zip | |
- turn on auto-generated perl requirements (#58519, #58536, #58537).
Sanity.
CVS patchset: 5265
CVS date: 2002/01/23 00:58:47
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/hdrinline.h | 4 | ||||
| -rw-r--r-- | rpmdb/legacy.c | 1 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 2 | ||||
| -rw-r--r-- | rpmdb/rpmhash.c | 13 |
4 files changed, 11 insertions, 9 deletions
diff --git a/rpmdb/hdrinline.h b/rpmdb/hdrinline.h index dd852a027..671bb2b1f 100644 --- a/rpmdb/hdrinline.h +++ b/rpmdb/hdrinline.h @@ -59,7 +59,7 @@ Header headerNew(void) * Reference a header instance. * @todo Remove debugging entry from the ABI. * @param h header - * @return new theader reference + * @return new header reference */ /*@unused@*/ static inline Header XheaderLink(Header h, /*@null@*/ const char * msg, @@ -73,7 +73,7 @@ Header XheaderLink(Header h, /*@null@*/ const char * msg, * Dereference a header instance. * @todo Remove debugging entry from the ABI. * @param h header - * @return new theader reference + * @return new header reference */ /*@unused@*/ static inline Header XheaderUnlink(/*@killref@*/ /*@null@*/ Header h, diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index bcacc42f1..9d9966cc2 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -49,6 +49,7 @@ int _noDirTokens = 0; /*@=exportheadervar@*/ static int dncmp(const void * a, const void * b) + /*@*/ { const char *const * first = a; const char *const * second = b; diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 59b5f8ebb..139215d7b 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -1883,7 +1883,7 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTag tag, regfree(preg); /*@+voidabstract -usereleased @*/ /* LCL: regfree has bogus only */ preg = _free(preg); - /*@=voidabstract@*/ + /*@=voidabstract =usereleased @*/ } /*@=kepttrans@*/ return rc; diff --git a/rpmdb/rpmhash.c b/rpmdb/rpmhash.c index 4af583246..751fd9063 100644 --- a/rpmdb/rpmhash.c +++ b/rpmdb/rpmhash.c @@ -137,10 +137,12 @@ void htFree(hashTable ht) for (i = 0; i < ht->numBuckets; i++) { b = ht->buckets[i]; - /*@-branchstate@*/ - if (ht->keySize && b) free((void *)b->key); - /*@=branchstate@*/ - while (b) { + if (b == NULL) + continue; + ht->buckets[i] = NULL; + if (ht->keySize > 0) + b->key = _free(b->key); + do { n = b->next; /*@-branchstate@*/ if (b->data) { @@ -150,8 +152,7 @@ void htFree(hashTable ht) } /*@=branchstate@*/ b = _free(b); - b = n; - } + } while ((b = n) != NULL); } ht->buckets = _free(ht->buckets); |