}
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
- if (!(rpmtsVSFlags(ts) & RPMVSF_NOHDRCHK))
- rc = rpmdbAdd(rpmtsGetRdb(ts), 0, h, ts, headerCheck);
- else
- rc = rpmdbAdd(rpmtsGetRdb(ts), 0, h, NULL, NULL);
+ rc = rpmdbAdd(rpmtsGetRdb(ts), h);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
if (rc == RPMRC_OK)
case PSM_RPMDB_REMOVE:
if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break;
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
- rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts),
- rpmteDBInstance(psm->te), NULL, NULL);
+ rc = rpmdbRemove(rpmtsGetRdb(ts), rpmteDBInstance(psm->te));
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
if (rc == RPMRC_OK)
rpmteSetDBInstance(psm->te, 0);
return rc;
}
-/* XXX psm.c */
-int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
- rpmts ts,
- rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
+int rpmdbRemove(rpmdb db, unsigned int hdrNum)
{
dbiIndex dbi;
Header h;
return hdrNum;
}
-/* XXX install.c */
-int rpmdbAdd(rpmdb db, int iid, Header h,
- rpmts ts,
- rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
+int rpmdbAdd(rpmdb db, Header h)
{
DBT hdr;
sigset_t signalMask;
hdr.data = headerUnload(h);
hdrOk = (hdr.data != NULL && hdr.size > 0);
- /* Check header digest/signature if enabled. */
- if (hdrchk && ts) {
- char * msg = NULL;
- rpmRC rpmrc = (*hdrchk) (ts, hdr.data, hdr.size, &msg);
- int lvl = (rpmrc == RPMRC_FAIL ? RPMLOG_ERR : RPMLOG_DEBUG);
-
- hdrOk = (rpmrc != RPMRC_FAIL);
-
- rpmlog(lvl, "%s h#%8u %s", hdrOk ? " +++" : _("rpmdbAdd: skipping"),
- hdrNum, (msg ? msg : "\n"));
- msg = _free(msg);
- }
-
if (!hdrOk) {
ret = -1;
goto exit;
/* Deleted entries are eliminated in legacy headers by copy. */
{ Header nh = (headerIsEntry(h, RPMTAG_HEADERIMAGE)
? headerCopy(h) : NULL);
- rc = rpmdbAdd(newdb, -1, (nh ? nh : h), ts, hdrchk);
+ rc = rpmdbAdd(newdb, (nh ? nh : h));
nh = headerFree(nh);
}
/** \ingroup rpmdb
* Add package header to rpm database and indices.
* @param db rpm database
- * @param iid (unused)
* @param h header
- * @param ts (unused) transaction set (or NULL)
- * @param (*hdrchk) (unused) headerCheck() vector (or NULL)
* @return 0 on success
*/
-int rpmdbAdd(rpmdb db, int iid, Header h, rpmts ts,
- rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg));
+int rpmdbAdd(rpmdb db, Header h);
/** \ingroup rpmdb
* Remove package header from rpm database and indices.
* @param db rpm database
- * @param rid (unused)
* @param hdrNum package instance number in database
- * @param ts (unused) transaction set (or NULL)
- * @param (*hdrchk) (unused) headerCheck() vector (or NULL)
* @return 0 on success
*/
-int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
- rpmts ts,
- rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg));
+int rpmdbRemove(rpmdb db, unsigned int hdrNum);
/** \ingroup rpmdb
* Rebuild database indices from package headers.
/* Add header to database. */
if (rpmtsOpenDB(ts, (O_RDWR|O_CREAT)))
goto exit;
- if (rpmdbAdd(rpmtsGetRdb(ts), 0, h, NULL, NULL) != 0)
+ if (rpmdbAdd(rpmtsGetRdb(ts), h) != 0)
goto exit;
rc = RPMRC_OK;