summaryrefslogtreecommitdiff
path: root/rpmdb
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-05-08 13:30:16 +0300
committerPanu Matilainen <pmatilai@redhat.com>2008-05-08 13:30:16 +0300
commit0af31c915e01b08f6efb044ac24a799c6b375410 (patch)
tree16f25b8979ceb497386f67fe78c9cb905a8aa8f0 /rpmdb
parent485ee9bbb4ff3e9c3b4cb65052055d4e8d47e78f (diff)
downloadrpm-0af31c915e01b08f6efb044ac24a799c6b375410.tar.gz
rpm-0af31c915e01b08f6efb044ac24a799c6b375410.tar.bz2
rpm-0af31c915e01b08f6efb044ac24a799c6b375410.zip
Lose the silly db argument from block/unblockSignals()
- unused, and unusable anyway as signals are global, not per db thing...
Diffstat (limited to 'rpmdb')
-rw-r--r--rpmdb/rpmdb.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 670d2cf14..b51af60a4 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -652,7 +652,7 @@ int rpmdbCheckSignals(void)
/**
* Block all signals, returning previous signal mask.
*/
-static int blockSignals(rpmdb db, sigset_t * oldMask)
+static int blockSignals(sigset_t * oldMask)
{
sigset_t newMask;
@@ -669,7 +669,7 @@ static int blockSignals(rpmdb db, sigset_t * oldMask)
/**
* Restore signal mask.
*/
-static int unblockSignals(rpmdb db, sigset_t * oldMask)
+static int unblockSignals(sigset_t * oldMask)
{
(void) rpmdbCheckSignals();
return sigprocmask(SIG_SETMASK, oldMask, NULL);
@@ -1473,7 +1473,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
}
if (data->data != NULL && rpmrc != RPMRC_FAIL) {
- (void) blockSignals(dbi->dbi_rpmdb, &signalMask);
+ (void) blockSignals(&signalMask);
rc = dbiPut(dbi, mi->mi_dbc, key, data, DB_KEYLAST);
if (rc) {
rpmlog(RPMLOG_ERR,
@@ -1481,7 +1481,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
rc, mi->mi_prevoffset, rpmTagGetName(dbi->dbi_rpmtag));
}
xx = dbiSync(dbi, 0);
- (void) unblockSignals(dbi->dbi_rpmdb, &signalMask);
+ (void) unblockSignals(&signalMask);
}
data->data = _free(data->data);
data->size = 0;
@@ -2430,7 +2430,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
free(nevra);
}
- (void) blockSignals(db, &signalMask);
+ (void) blockSignals(&signalMask);
/* FIX: rpmvals heartburn */
{ int dbix;
@@ -2658,7 +2658,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
rec = _free(rec);
}
- (void) unblockSignals(db, &signalMask);
+ (void) unblockSignals(&signalMask);
h = headerFree(h);
@@ -2711,7 +2711,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h,
xx = hge(h, RPMTAG_BASENAMES, &bnt, (rpm_data_t *) &baseNames, &count);
- (void) blockSignals(db, &signalMask);
+ (void) blockSignals(&signalMask);
{
unsigned int firstkey = 0;
@@ -3048,7 +3048,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h,
}
exit:
- (void) unblockSignals(db, &signalMask);
+ (void) unblockSignals(&signalMask);
return ret;
}