}
/* Destroy set of index database items */
-static dbiIndexSet dbiFreeIndexSet(dbiIndexSet set)
+static dbiIndexSet dbiIndexSetFree(dbiIndexSet set)
{
if (set) {
free(set->recs);
fpCacheFree(fpc);
if ((*matches)->count == 0) {
- *matches = dbiFreeIndexSet(*matches);
+ *matches = dbiIndexSetFree(*matches);
rc = 1;
} else {
rc = 0;
}
exit:
- dbiFreeIndexSet(allMatches);
+ dbiIndexSetFree(allMatches);
free(dirName);
return rc;
}
(void) dbt2set(dbi, &data, &matches);
if (matches) {
rc = dbiIndexSetCount(matches);
- matches = dbiFreeIndexSet(matches);
+ matches = dbiIndexSetFree(matches);
}
} else if (rc == DB_NOTFOUND) { /* not found */
rc = 0;
exit:
/* FIX: double indirection */
if (rc && matches && *matches)
- *matches = dbiFreeIndexSet(*matches);
+ *matches = dbiIndexSetFree(*matches);
return rc;
}
goto exit;
/* FIX: double indirection */
- *matches = dbiFreeIndexSet(*matches);
+ *matches = dbiIndexSetFree(*matches);
/* maybe a name and a release */
s = stpcpy(localarg, arg);
if (rc != RPMRC_NOTFOUND) goto exit;
/* FIX: double indirection */
- *matches = dbiFreeIndexSet(*matches);
+ *matches = dbiIndexSetFree(*matches);
/* how about name-version-release? */
}
mi->mi_re = _free(mi->mi_re);
- mi->mi_set = dbiFreeIndexSet(mi->mi_set);
+ mi->mi_set = dbiIndexSetFree(mi->mi_set);
mi->mi_keyp = _free(mi->mi_keyp);
rpmdbClose(mi->mi_db);
mi->mi_ts = rpmtsFree(mi->mi_ts);
memcpy(mi->mi_set->recs + mi->mi_set->count, set->recs,
set->count * sizeof(*(mi->mi_set->recs)));
mi->mi_set->count += set->count;
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
}
return rc;
dbiCursorFree(dbc);
}
if (rc) { /* error/not found */
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
goto exit;
}
} else {
set = newset;
} else {
dbiAppendSet(set, newset->recs, newset->count, sizeof(*(set->recs)), 0);
- dbiFreeIndexSet(newset);
+ dbiIndexSetFree(newset);
}
}
dbiCursorFree(dbc);
if (rc != DB_NOTFOUND) { /* error */
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
goto exit;
}
}
ii->ii_dbc = dbiCursorInit(ii->ii_dbi, 0);
/* free old data */
- ii->ii_set = dbiFreeIndexSet(ii->ii_set);
+ ii->ii_set = dbiIndexSetFree(ii->ii_set);
memset(&data, 0, sizeof(data));
rc = dbiCursorGet(ii->ii_dbc, &ii->ii_key, &data, DB_NEXT);
ii->ii_dbc = dbiCursorFree(ii->ii_dbc);
ii->ii_dbi = NULL;
rpmdbClose(ii->ii_db);
- ii->ii_set = dbiFreeIndexSet(ii->ii_set);
+ ii->ii_set = dbiIndexSetFree(ii->ii_set);
ii = _free(ii);
return NULL;
/* If nothing was pruned, then don't bother updating. */
if (rc) {
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
goto cont;
}
ret += 1;
}
}
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
cont:
if (freedata) {
free(key.data);
}
data.data = _free(data.data);
data.size = 0;
- set = dbiFreeIndexSet(set);
+ set = dbiIndexSetFree(set);
cont:
if (freedata) {
free(key.data);