diff options
| author | jbj <devnull@localhost> | 2002-07-11 16:44:55 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-07-11 16:44:55 +0000 |
| commit | 1bbc4b2c373811287f7f199f38485eb9e394939f (patch) | |
| tree | 5849c35472af3ebf107c5f9553510e1d62eb4631 /rpmdb/rpmdb.c | |
| parent | f0ad50e2669da6cedcec2c193cc9783cf63091a9 (diff) | |
| download | rpm-1bbc4b2c373811287f7f199f38485eb9e394939f.tar.gz rpm-1bbc4b2c373811287f7f199f38485eb9e394939f.tar.bz2 rpm-1bbc4b2c373811287f7f199f38485eb9e394939f.zip | |
- fix: repair 2ndary match criteria with rpmdb iterators.
CVS patchset: 5544
CVS date: 2002/07/11 16:44:55
Diffstat (limited to 'rpmdb/rpmdb.c')
| -rw-r--r-- | rpmdb/rpmdb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 6175d0cd6..8d1982121 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -1761,8 +1761,8 @@ static int mireSkip (const rpmdbMatchIterator mi) return 0; /* - * Apply tag tests, implictly "||" for multiple patterns/values of a - * single tag, implictly "&&" between multiple tag patterns. + * Apply tag tests, implicitly "||" for multiple patterns/values of a + * single tag, implicitly "&&" between multiple tag patterns. */ if ((mire = mi->mi_re) != NULL) for (i = 0; i < mi->mi_nre; i++, mire++) { @@ -1856,8 +1856,8 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified) { Header rpmdbNextIterator(rpmdbMatchIterator mi) { dbiIndex dbi; - void * uh = NULL; - size_t uhlen = 0; + void * uh; + size_t uhlen; DBT * key; DBT * data; void * keyp; @@ -1887,6 +1887,8 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) memset(data, 0, sizeof(*data)); top: + uh = NULL; + uhlen = 0; /* XXX skip over instances with 0 join key */ do { |