diff options
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/header.c | 4 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/rpmdb/header.c b/rpmdb/header.c index c2c3aaf62..c2ad9359e 100644 --- a/rpmdb/header.c +++ b/rpmdb/header.c @@ -2683,10 +2683,10 @@ static char * formatValue(sprintfTag tag, Header h, /*@=branchstate@*/ if (tag->arrayCount) { - /*@-observertrans -modobserver@*/ + /*@-branchstate -observertrans -modobserver@*/ if (datafree) data = headerFreeData(data, type); - /*@=observertrans =modobserver@*/ + /*@=branchstate =observertrans =modobserver@*/ countBuf = count; data = &countBuf; diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 87b37eea0..7af2fc613 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -2022,7 +2022,9 @@ static int mireSkip (const rpmdbMatchIterator mi) if (mire->tag != RPMTAG_EPOCH) continue; t = RPM_INT32_TYPE; +/*@-immediatetrans@*/ u.i32p = &zero; +/*@=immediatetrans@*/ c = 1; } @@ -2140,6 +2142,8 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) if (mi == NULL) return NULL; + (void) checkSignals(); + dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0); if (dbi == NULL) return NULL; |