summaryrefslogtreecommitdiff
path: root/rpmdb
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-08-20 22:05:18 +0000
committerjbj <devnull@localhost>2002-08-20 22:05:18 +0000
commitb6b6612cfa451a62839e45b69423eb1a16a03f57 (patch)
treeae68d02919c0e94b192c6ab65fbbfb201541115d /rpmdb
parent46d1fa7527073148293e8a49ed13c80043758dae (diff)
downloadlibrpm-tizen-b6b6612cfa451a62839e45b69423eb1a16a03f57.tar.gz
librpm-tizen-b6b6612cfa451a62839e45b69423eb1a16a03f57.tar.bz2
librpm-tizen-b6b6612cfa451a62839e45b69423eb1a16a03f57.zip
- check for interrupt during iteration.
- python: add ts.setProbFilter() method, remove ts.run() argument. CVS patchset: 5652 CVS date: 2002/08/20 22:05:18
Diffstat (limited to 'rpmdb')
-rw-r--r--rpmdb/header.c4
-rw-r--r--rpmdb/rpmdb.c4
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;